[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#50201] [PATCH 06/52] gnu: nspr: Adjust to Mozilla cross-compilation
From: |
Maxime Devos |
Subject: |
[bug#50201] [PATCH 06/52] gnu: nspr: Adjust to Mozilla cross-compilation conventions. |
Date: |
Wed, 25 Aug 2021 20:02:46 +0200 |
* gnu/packages/nss.scm
(nspr)[arguments]<#:configure-flags>: Set --host and --target
inappropriately when cross-compiling.
---
gnu/packages/nss.scm | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm
index 55eddc0c91..6560aede56 100644
--- a/gnu/packages/nss.scm
+++ b/gnu/packages/nss.scm
@@ -6,6 +6,7 @@
;;; Copyright © 2020, 2021 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -51,11 +52,20 @@
`(("perl" ,perl)))
(arguments
`(#:tests? #f ; no check target
- #:configure-flags (list "--disable-static"
- "--enable-64bit"
- (string-append "LDFLAGS=-Wl,-rpath="
- (assoc-ref %outputs "out")
- "/lib"))
+ #:configure-flags
+ (list "--disable-static"
+ "--enable-64bit"
+ (string-append "LDFLAGS=-Wl,-rpath="
+ (assoc-ref %outputs "out") "/lib")
+ ;; Mozilla deviates from Autotools conventions
+ ;; due to historical reasons. Adjust to Mozilla conventions,
+ ;; otherwise the Makefile will try to use TARGET-gcc
+ ;; as a ‘native’ compiler.
+ ,@(if (%current-target-system)
+ `(,(string-append "--host="
+ (nix-system->gnu-triplet
(%current-system)))
+ ,(string-append "--target=" (%current-target-system)))
+ '()))
;; Use fixed timestamps for reproducibility.
#:make-flags '("SH_DATE='1970-01-01 00:00:01'"
;; This is epoch 1 in microseconds.
--
2.33.0
- [bug#50201] [PATCH core-updates-frozen 0/52] Support cross-compilation in glib-or-gtk-build-system and fix cross-compilation errors, Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 01/52] gnu: dbus-glib: Support cross-compilation., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 03/52] gnu: elogind: Fix cross-compilation., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 02/52] gnu: elogind: Make #:configure-flags a G-exp., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 04/52] gnu: libcap: Fix cross-compilation build failures., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 06/52] gnu: nspr: Adjust to Mozilla cross-compilation conventions.,
Maxime Devos <=
- [bug#50201] [PATCH 07/52] gnu: nspr: Don't retain references to native inputs., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 09/52] gnu: poppler: Find pkg-config when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 08/52] gnu: mozjs-60: Fix cross-compilation build errors., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 10/52] build-system/meson: Allow 'configure-flags' to be a G-exp., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 12/52] gnu: dbus-cairo: Add missing bash-minimal input., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 20/52] gnu: gamin: Recognise aarch64 as architecture when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 22/52] gnu: iso-codes: Move inputs to native-inputs when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 17/52] gnu: atk: Disable introspection when cross-compiling., Maxime Devos, 2021/08/25