[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/52: gnu: nspr: Adjust to Mozilla cross-compilation conventions.
From: |
guix-commits |
Subject: |
06/52: gnu: nspr: Adjust to Mozilla cross-compilation conventions. |
Date: |
Mon, 20 Sep 2021 07:19:27 -0400 (EDT) |
mothacehe pushed a commit to branch core-updates-frozen
in repository guix.
commit 1d3cb218531df00af48d6a38d57e5ed35df6eac3
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Tue Aug 24 10:05:52 2021 +0200
gnu: nspr: Adjust to Mozilla cross-compilation conventions.
* 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 55eddc0..6560aed 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.
- branch core-updates-frozen updated (4bacf9c -> aacaa22), guix-commits, 2021/09/20
- 02/52: gnu: elogind: Make #:configure-flags a G-exp., guix-commits, 2021/09/20
- 01/52: gnu: dbus-glib: Support cross-compilation., guix-commits, 2021/09/20
- 07/52: gnu: nspr: Don't retain references to native inputs., guix-commits, 2021/09/20
- 11/52: build-system/glib-or-gtk: Support cross-compilaton., guix-commits, 2021/09/20
- 23/52: gnu: heimdal: Fix inputs when cross-compiling., guix-commits, 2021/09/20
- 24/52: gnu: heimdal: Fix linking error when cross-compiling., guix-commits, 2021/09/20
- 12/52: gnu: dbus-cairo: Add missing bash-minimal input., guix-commits, 2021/09/20
- 18/52: gnu: bdb: Fix cross-compilation build errors., guix-commits, 2021/09/20
- 06/52: gnu: nspr: Adjust to Mozilla cross-compilation conventions.,
guix-commits <=
- 13/52: gnu: polkit: Prevent cross-compilation build error., guix-commits, 2021/09/20
- 17/52: gnu: atk: Disable introspection when cross-compiling., guix-commits, 2021/09/20
- 16/52: gobject-introspection: Correct library name when cross-compiling., guix-commits, 2021/09/20
- 34/52: gnu: libdaemon: Support cross-compilation to aarch64-linux-gnu., guix-commits, 2021/09/20
- 35/52: gnu: avahi: Find 'TARGET-pkg-config' when cross-compiling., guix-commits, 2021/09/20
- 28/52: gnu: heimdal: Use libcom_err from input when cross-compiling., guix-commits, 2021/09/20
- 21/52: gnu: gamin: Fix 'configure' script when cross-compiling., guix-commits, 2021/09/20
- 09/52: gnu: poppler: Find pkg-config when cross-compiling., guix-commits, 2021/09/20
- 19/52: gnu: graphene: Don't build introspection data when cross-compiling., guix-commits, 2021/09/20
- 25/52: gnu: heimdal: Refer to cross-compiled bash., guix-commits, 2021/09/20