mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-02-09 12:49:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: nspr: Adjust to Mozilla cross-compilation conventions.

Browse source 
* gnu/packages/nss.scm
  (nspr)[arguments]<#:configure-flags>: Set --host and --target
  inappropriately when cross-compiling.
This commit is contained in:
Maxime Devos 2021-08-24 10:05:52 +02:00 • committed by Mathieu Othacehe
parent 5fc78abc7f
commit 1d3cb21853
No known key found for this signature in database
GPG key ID: 8354763531769CA6
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gnu/packages/nss.scm
View file

@ -6,6 +6,7 @@
;;; Copyright © 2020, 2021 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020, 2021 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de> ;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -51,11 +52,20 @@
`(("perl" ,perl))) `(("perl" ,perl)))
(arguments (arguments
`(#:tests? #f ; no check target `(#:tests? #f ; no check target
#:configure-flags (list "--disable-static" #:configure-flags
(list "--disable-static"
"--enable-64bit" "--enable-64bit"
(string-append "LDFLAGS=-Wl,-rpath=" (string-append "LDFLAGS=-Wl,-rpath="
(assoc-ref %outputs "out") (assoc-ref %outputs "out") "/lib")
"/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. ;; Use fixed timestamps for reproducibility.
#:make-flags '("SH_DATE='1970-01-01 00:00:01'" #:make-flags '("SH_DATE='1970-01-01 00:00:01'"
;; This is epoch 1 in microseconds. ;; This is epoch 1 in microseconds.