[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/38: gnu: nspr: Use mozilla-build-system.
From: |
guix-commits |
Subject: |
02/38: gnu: nspr: Use mozilla-build-system. |
Date: |
Sat, 2 Oct 2021 12:52:37 -0400 (EDT) |
mothacehe pushed a commit to branch core-updates
in repository guix.
commit 385ba2f369e8fd65e5387185c36127cef7a78488
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Fri Oct 1 16:21:04 2021 +0200
gnu: nspr: Use mozilla-build-system.
* gnu/packages/nss.scm
(nspr)[build-system]: Adjust it.
(nspr)[arguments]<#:configure-flags>: Remove now superfluous --target and
--host.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
---
gnu/packages/nss.scm | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm
index 381756e..6196ad6 100644
--- a/gnu/packages/nss.scm
+++ b/gnu/packages/nss.scm
@@ -29,6 +29,7 @@
#:use-module (guix gexp)
#:use-module (guix download)
#:use-module (guix build-system gnu)
+ #:use-module (guix build-system mozilla)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages)
#:use-module (gnu packages bash)
@@ -49,7 +50,7 @@
(sha256
(base32
"1j5b2m8cjlhnnv8sq34587avaagkqvh521w4f95miwgvsn3xlaap"))))
- (build-system gnu-build-system)
+ (build-system mozilla-build-system)
(inputs
;; TODO(core-updates): Make these inputs unconditional.
;; For 'compile-et.pl' and 'nspr-config'.
@@ -72,16 +73,7 @@
(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)))
- '()))
+ (assoc-ref %outputs "out") "/lib"))
;; Use fixed timestamps for reproducibility.
#:make-flags '("SH_DATE='1970-01-01 00:00:01'"
;; This is epoch 1 in microseconds.
- branch core-updates updated (0cccc2f -> fcaed5b), guix-commits, 2021/10/02
- 01/38: build-system/mozilla: New build system., guix-commits, 2021/10/02
- 04/38: gnu: icecat: Use mozilla-build-system., guix-commits, 2021/10/02
- 08/38: gnu: isc-dhcp: Don't use canonical-package., guix-commits, 2021/10/02
- 09/38: gnu: isc-dhcp: Make an input unconditional., guix-commits, 2021/10/02
- 02/38: gnu: nspr: Use mozilla-build-system.,
guix-commits <=
- 03/38: gnu: mozjs: Use mozilla-build-system., guix-commits, 2021/10/02
- 05/38: build/minetest-build-system: Move png-file? to (guix build utils)., guix-commits, 2021/10/02
- 10/38: gnu: isc-dhcp: Remove unnecessary shebang patching., guix-commits, 2021/10/02
- 06/38: gnu: mozjs: Make the native-inputs unconditional., guix-commits, 2021/10/02
- 07/38: gnu: mozjs: Make the quasiquote unconditional., guix-commits, 2021/10/02
- 11/38: gnu: isc-dhcp: Remove trailing #t., guix-commits, 2021/10/02
- 16/38: gnu: libdatrie: Make input labels match the package name., guix-commits, 2021/10/02
- 14/38: gnu: cairo: Make 'bash-minimal' input unconditional., guix-commits, 2021/10/02
- 15/38: gnu: libthai: Make 'datrie' input unconditional., guix-commits, 2021/10/02
- 17/38: gnu: pango: Make 'bash-minimal' input unconditional., guix-commits, 2021/10/02