[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/104: gnu: openjdk9: Build in parallel.
From: |
guix-commits |
Subject: |
02/104: gnu: openjdk9: Build in parallel. |
Date: |
Sun, 17 May 2020 11:36:23 -0400 (EDT) |
nckx pushed a commit to branch core-updates
in repository guix.
commit f3273e0f713bf28c32ddc9b9546c81c033db7330
Author: Ricardo Wurmus <address@hidden>
AuthorDate: Thu May 14 21:32:30 2020 +0200
gnu: openjdk9: Build in parallel.
* gnu/packages/java.scm (openjdk9)[arguments]: Add phase
"write-source-revision-file"; replace "build" phase; add make-flags; remove
GUIX_LD_WRAPPER_ALLOW_IMPURITIES.
---
gnu/packages/java.scm | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index d03d783..ef7796f 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1815,6 +1815,7 @@ new Date();"))
(outputs '("out" "jdk" "doc"))
(arguments
`(#:tests? #f; require jtreg
+ #:make-flags '("all")
#:imported-modules
((guix build syscalls)
,@%gnu-build-system-modules)
@@ -1839,14 +1840,20 @@ new Date();"))
"--with-libjpeg=system"
(string-append "--prefix=" (assoc-ref outputs "out")))
#t))
- (replace 'build
+ (add-before 'build 'write-source-revision-file
(lambda _
(with-output-to-file ".src-rev"
(lambda _
(display ,version)))
- (setenv "GUIX_LD_WRAPPER_ALLOW_IMPURITIES" "yes")
- (invoke "make" "all")
#t))
+ (replace 'build
+ (lambda* (#:key make-flags parallel-build? #:allow-other-keys)
+ (apply invoke "make"
+ `(,@(if parallel-build?
+ (list (string-append "JOBS="
+ (number->string
(parallel-job-count))))
+ '())
+ ,@make-flags))))
;; Some of the libraries in the lib/ folder link to libjvm.so.
;; But that shared object is located in the server/ folder, so it
;; cannot be found. This phase creates a symbolic link in the
@@ -1919,8 +1926,7 @@ new Date();"))
(native-inputs
`(("icedtea-8" ,icedtea-8)
("icedtea-8:jdk" ,icedtea-8 "jdk")
- ;; XXX: The build system is not particularly parallel safe and
- ;; fails with newer versions of GNU Make.
+ ;; XXX: The build system fails with newer versions of GNU Make.
("make@4.2" ,gnu-make-4.2)
("unzip" ,unzip)
("which" ,which)
- branch core-updates updated (8d33f26 -> 19c2876), guix-commits, 2020/05/17
- 01/104: gnu: openjdk9: Simplify snippet., guix-commits, 2020/05/17
- 02/104: gnu: openjdk9: Build in parallel.,
guix-commits <=
- 03/104: gnu: openjdk10: Simplify snippet., guix-commits, 2020/05/17
- 06/104: gnu: openjdk12: Simplify snippet., guix-commits, 2020/05/17
- 05/104: gnu: openjdk11: Build in parallel., guix-commits, 2020/05/17
- 07/104: gnu: rottlog: Fix aarch64 cross-compilation., guix-commits, 2020/05/17
- 09/104: gnu: ocaml-octavius: Update to 1.2.2., guix-commits, 2020/05/17
- 12/104: gnu: emacs-flycheck: Update to 31-2.9bcf6b6., guix-commits, 2020/05/17
- 13/104: gnu: bitcoin-unlimited: Update to 1.8.0.0., guix-commits, 2020/05/17
- 10/104: gnu: ocaml-fileutils: Update to 0.6.2., guix-commits, 2020/05/17
- 11/104: gnu: ocaml-ocurl: Update to 0.9.1., guix-commits, 2020/05/17
- 15/104: gnu: tor: Update to 0.4.3.5., guix-commits, 2020/05/17