summaryrefslogtreecommitdiff
path: root/gnu/packages/java.scm
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2020-03-28 20:57:27 +0100
committerMarius Bakke <mbakke@fastmail.com>2020-03-28 20:57:27 +0100
commit5fd0c288cf238e4369cc6bd0bfbee068a362a9f0 (patch)
tree98077e2552856deb18bbc3347627db1b6281e5df /gnu/packages/java.scm
parent313bf502b52cf16e8934493e41e547c7dbdd31e0 (diff)
downloadpatches-5fd0c288cf238e4369cc6bd0bfbee068a362a9f0.tar
patches-5fd0c288cf238e4369cc6bd0bfbee068a362a9f0.tar.gz
gnu: OpenJDK: Build with GNU Make 4.2.
* gnu/packages/base.scm (gnu-make-4.2): New public variable. * gnu/packages/java.scm (openjdk9, openjdk10, openjdk11, openjdk12)[native-inputs]: Add it.
Diffstat (limited to 'gnu/packages/java.scm')
-rw-r--r--gnu/packages/java.scm6
1 files changed, 6 insertions, 0 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index edf8d3ce8e..c68b0d3fd2 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1880,6 +1880,9 @@ 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.
+ ("make@4.2" ,gnu-make-4.2)
("unzip" ,unzip)
("which" ,which)
("zip" ,zip)))
@@ -1936,6 +1939,7 @@ new Date();"))
(native-inputs
`(("openjdk9" ,openjdk9)
("openjdk9:jdk" ,openjdk9 "jdk")
+ ("make@4.2" ,gnu-make-4.2)
("unzip" ,unzip)
("which" ,which)
("zip" ,zip)))))
@@ -2156,6 +2160,7 @@ new Date();"))
`(("autoconf" ,autoconf)
("openjdk10" ,openjdk10)
("openjdk10:jdk" ,openjdk10 "jdk")
+ ("make" ,gnu-make-4.2)
("pkg-config" ,pkg-config)
("unzip" ,unzip)
("which" ,which)
@@ -2204,6 +2209,7 @@ new Date();"))
`(("autoconf" ,autoconf)
("openjdk11" ,openjdk11)
("openjdk11:jdk" ,openjdk11 "jdk")
+ ("make@4.2" ,gnu-make-4.2)
("pkg-config" ,pkg-config)
("unzip" ,unzip)
("which" ,which)