[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/38: gnu: mozjs: Use mozilla-build-system.
|
From: |
guix-commits |
|
Subject: |
03/38: gnu: mozjs: 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 5d8515b3373be49bfccd3557bf621e3b64ba2cd0
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Fri Oct 1 16:21:05 2021 +0200
gnu: mozjs: Use mozilla-build-system.
Due to the use of 'inherit', all versions of mozjs are adjusted.
* gnu/packages/gnuzilla.scm
(mozjs)[build-system]: Adjust it.
(mozjs)[arguments]<#:configure-flags>: Remove now superfluous --target and
--host.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
---
gnu/packages/gnuzilla.scm | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 5dd90e4..9647bb7 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -49,6 +49,7 @@
#:use-module (guix build-system gnu)
#:use-module (guix build-system cargo)
#:use-module (guix build-system trivial)
+ #:use-module (guix build-system mozilla)
#:use-module (gnu packages admin)
#:use-module (gnu packages audio)
#:use-module (gnu packages autotools)
@@ -108,7 +109,7 @@
(substitute* '("js/src/config/milestone.pl")
(("defined\\(@TEMPLATE_FILE)") "@TEMPLATE_FILE"))
#t))))
- (build-system gnu-build-system)
+ (build-system mozilla-build-system)
(native-inputs
`(("perl" ,perl)
("pkg-config" ,pkg-config)
@@ -390,15 +391,7 @@ in C/C++.")
;; This is important because without it gjs will segfault during
the
;; configure phase. With jemalloc only the standalone mozjs
console
;; will work.
- "--disable-jemalloc"
- ;; Mozilla deviates from Autotools conventions due to historical
- ;; reasons.
- #$@(if (%current-target-system)
- #~(#$(string-append
- "--host="
- (nix-system->gnu-triplet (%current-system)))
- #$(string-append "--target=" (%current-target-system)))
- #~())))
+ "--disable-jemalloc"))
#:phases
(modify-phases %standard-phases
;; Make sure pkg-config will be found.
- 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, 2021/10/02
- 03/38: gnu: mozjs: Use mozilla-build-system.,
guix-commits <=
- 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
- 13/38: gnu: gobject-introspection: Use python instead of python-wrapper., guix-commits, 2021/10/02