amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: openjdk11: Disable parallel build.

Browse source 
* gnu/packages/java.scm (openjdk11)[arguments]
<#:parallel-build?>: Unset.
<#:phases>{build, build-jre}: Explicitly set JOBS to 1 when parallel
build unset.
(openjdk12)[arguments]<#:parallel-build?>: Set.
(openjdk9)<#:phases>{build}: Explicitly set JOBS to 1 when parallel
build is unset.

Change-Id: I1a1e5d89e6a223f069755ab7dcc6242a4e90e7cc
Signed-off-by: Julien Lepiller <julien@lepiller.eu>
This commit is contained in:
Greg Hogan 2025-09-03 16:35:56 +00:00 • committed by Julien Lepiller
parent 348c654bf3
commit 5bd13a835b
No known key found for this signature in database
GPG key ID: 53D457B2D636EE82
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gnu/packages/java.scm
View file

@ -981,7 +981,7 @@ new Date();"))
`(,@(if parallel-build? `(,@(if parallel-build?
(list (string-append "JOBS=" (list (string-append "JOBS="
(number->string (parallel-job-count)))) (number->string (parallel-job-count))))
'()) '("JOBS=1"))
,@make-flags)))) ,@make-flags))))
(add-after 'unpack 'patch-jni-libs (add-after 'unpack 'patch-jni-libs
;; Hardcode dynamically loaded libraries. ;; Hardcode dynamically loaded libraries.
@ -1340,6 +1340,8 @@ new Date();"))
(outputs '("out" "jdk" "doc")) (outputs '("out" "jdk" "doc"))
(arguments (arguments
(list (list
;; Prevent a java.util.ConcurrentModificationException.
#:parallel-build? #f
#:modules `((guix build gnu-build-system) #:modules `((guix build gnu-build-system)
(guix build utils) (guix build utils)
(ice-9 match) (ice-9 match)
@ -1438,7 +1440,7 @@ new Date();"))
`(,@(if parallel-build? `(,@(if parallel-build?
(list (string-append "JOBS=" (list (string-append "JOBS="
(number->string (parallel-job-count)))) (number->string (parallel-job-count))))
'()) '("JOBS=1"))
,@make-flags)))) ,@make-flags))))
;; jdk 11 does not build jre by default any more; so explicitly build ;; jdk 11 does not build jre by default any more; so explicitly build
;; it (see: ;; it (see:
@ -1449,7 +1451,7 @@ new Date();"))
`(,@(if parallel-build? `(,@(if parallel-build?
(list (string-append "JOBS=" (list (string-append "JOBS="
(number->string (parallel-job-count)))) (number->string (parallel-job-count))))
'()) '("JOBS=1"))
,@make-flags)))) ,@make-flags))))
(replace 'install (replace 'install
(lambda _ (lambda _
@ -1665,6 +1667,8 @@ new Date();"))
(patches (search-patches "openjdk-10-setsignalhandler.patch")))) (patches (search-patches "openjdk-10-setsignalhandler.patch"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments openjdk11) (substitute-keyword-arguments (package-arguments openjdk11)
;; Re-enable parallel build.
((#:parallel-build? _ #t) #t)
((#:phases phases) ((#:phases phases)
#~(modify-phases #$phases #~(modify-phases #$phases
#$@(if (target-aarch64?) #$@(if (target-aarch64?)