diff options
Diffstat (limited to 'gnu/packages/java.scm')
| -rw-r--r-- | gnu/packages/java.scm | 43 |
1 files changed, 24 insertions, 19 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 54a9aa9ba0..6e61bded23 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2019, 2020, 2021 Björn Höfling <bjoern.hoefling@bjoernhoefling.de> ;;; Copyright © 2020, 2025 Janneke Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org> -;;; Copyright © 2020, 2022, 2025 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2020, 2022, 2025 Maxim Cournoyer <maxim@guixotic.coop> ;;; Copyright © 2021 Vincent Legoll <vincent.legoll@gmail.com> ;;; Copyright © 2021 Mike Gerwitz <mtg@gnu.org> ;;; Copyright © 2021 Pierre Langlois <pierre.langlois@gmx.com> @@ -58,7 +58,7 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bash) - #:use-module (gnu packages certs) + #:use-module (gnu packages nss) #:use-module (gnu packages cpio) #:use-module (gnu packages cups) #:use-module (gnu packages compression) @@ -981,7 +981,7 @@ new Date();")) `(,@(if parallel-build? (list (string-append "JOBS=" (number->string (parallel-job-count)))) - '()) + '("JOBS=1")) ,@make-flags)))) (add-after 'unpack 'patch-jni-libs ;; Hardcode dynamically loaded libraries. @@ -1340,6 +1340,8 @@ new Date();")) (outputs '("out" "jdk" "doc")) (arguments (list + ;; Prevent a java.util.ConcurrentModificationException. + #:parallel-build? #f #:modules `((guix build gnu-build-system) (guix build utils) (ice-9 match) @@ -1438,7 +1440,7 @@ new Date();")) `(,@(if parallel-build? (list (string-append "JOBS=" (number->string (parallel-job-count)))) - '()) + '("JOBS=1")) ,@make-flags)))) ;; jdk 11 does not build jre by default any more; so explicitly build ;; it (see: @@ -1449,7 +1451,7 @@ new Date();")) `(,@(if parallel-build? (list (string-append "JOBS=" (number->string (parallel-job-count)))) - '()) + '("JOBS=1")) ,@make-flags)))) (replace 'install (lambda _ @@ -1665,6 +1667,8 @@ new Date();")) (patches (search-patches "openjdk-10-setsignalhandler.patch")))) (arguments (substitute-keyword-arguments (package-arguments openjdk11) + ;; Re-enable parallel build. + ((#:parallel-build? _ #t) #t) ((#:phases phases) #~(modify-phases #$phases #$@(if (target-aarch64?) @@ -1964,14 +1968,14 @@ OpenJDK.") (define-public ant/java8 (package (name "ant") - (version "1.10.13") + (version "1.10.15") (source (origin (method url-fetch) (uri (string-append "mirror://apache/ant/source/apache-ant-" version "-src.tar.gz")) (sha256 (base32 - "01l4g9b1xnnq450ljvhrlvcf8wzzmr45wmhkybrx0hcdi166y06s")) + "1ccr852dxg5affdqafg04gi3l89q5c6l9lqrz50jhj05kidljax2")) (modules '((guix build utils))) (snippet '(begin @@ -3090,6 +3094,7 @@ libraries from the SIS division at ETH Zurich like jHDF5.") (apply invoke `("gcc" "-shared" "-O3" "-fPIC" "-Wl,--exclude-libs,ALL" + "-Wno-error=implicit-function-declaration" ,@(find-files "jhdf5" "\\.c$") ,@(find-files "hdf-java" "\\.c$") ,(string-append "-I" hdf5 "/include") @@ -10045,21 +10050,21 @@ to create those artifacts.") "archive/exam-reactor-" version ".tar.gz")) (sha256 (base32 - "08mzw8nkah3rj3vznlplnawspxhp61zgvb44ifqa1rni1cvbms2g")))) + "1b0f89gawxyl0pkqx9sicp6n58pirkzhjw41y749bwrkb6h99i26")))) (arguments - `(#:jar-name "java-ops4j-pax-exam-core.jar" - #:source-dir "core/pax-exam/src/main/java" - #:test-dir "core/pax-exam/src/test")) + (list #:jar-name "java-ops4j-pax-exam-core.jar" + #:source-dir "core/pax-exam/src/main/java" + #:test-dir "core/pax-exam/src/test")) (inputs - `(("slf4j" ,java-slf4j-api) - ("lang" ,java-ops4j-base-lang) - ("io" ,java-ops4j-base-io) - ("util-property" ,java-ops4j-base-util-property) - ("util-store" ,java-ops4j-base-store) - ("java-osgi-core" ,java-osgi-core))) + (list java-slf4j-api + java-ops4j-base-lang + java-ops4j-base-io + java-ops4j-base-util-property + java-ops4j-base-store + java-osgi-core)) (native-inputs - `(("junit" ,java-junit) - ("hamcrest" ,java-hamcrest-core))) + (list java-junit + java-hamcrest-core)) (build-system ant-build-system) (home-page "https://ops4j1.jira.com/wiki/spaces/PAXEXAM4/overview") (synopsis "In-Container Testing for OSGi, Java EE and CDI") |