diff options
Diffstat (limited to 'gnu/packages/java.scm')
| -rw-r--r-- | gnu/packages/java.scm | 44 |
1 files changed, 30 insertions, 14 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index c25a330c2a..f467c473d7 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -903,15 +903,23 @@ supports sufficient parts of Java 7 to build Icedtea 2.x.") "openjdk.src/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c") (("#include <sys/sysctl.h>") "#include <linux/sysctl.h>")) + + ;; XXX 'ldd' in glibc 2.35 segfaults upon reading + ;; openjdk.build-boot/lib/amd64/libnio.so (!). + ;; It is only used as a verification step, so ignore it; + ;; try removing this substitution for newer versions of glibc. + (substitute* "openjdk.src/jdk/make/common/shared/Defs-linux.gmk" + (("\\$\\(LDD\\) \\$1 &&") + "")) + ;; It looks like the "h = 31 * h + c" line of the jsum() ;; function gets miscompiled. After a few iterations of the loop ;; the result of "31 * h" is always 0x8000000000000000. - ;; Bad optimization maybe... - ;; Transform "31 * h + c" into a convoluted "32 * h + c - h" - ;; as a workaround. - (substitute* "openjdk.src/hotspot/src/share/vm/memory/dump.cpp" - (("h = 31 \\* h \\+ c;") - "jlong h0 = h;\nfor(int i = 0; i < 5; i++) h += h;\nh += c - h0;")))) + ;; Disable optimizations of dump.cpp as a workaround. + (substitute* "openjdk.src/hotspot/make/linux/makefiles/gcc.make" + (("OPT_CFLAGS/NOOPT.*" all) + (string-append all "\n" + "OPT_CFLAGS/dump.o += -O0"))))) (add-after 'unpack 'fix-x11-extension-include-path (lambda* (#:key inputs #:allow-other-keys) (substitute* "openjdk.src/jdk/make/sun/awt/mawt.gmk" @@ -1287,7 +1295,8 @@ supports sufficient parts of Java 7 to build Icedtea 2.x.") (base32 "17bdv39n4lh8l5737c96f3xgamx4y305m067p01cywgp7zaddqws")) (patches (search-patches - "icedtea-7-hotspot-aarch64-use-c++98.patch")))) + "icedtea-7-hotspot-aarch64-use-c++98.patch" + "icedtea-7-hotspot-pointer-comparison.patch")))) ("ant" ,ant-bootstrap) ("attr" ,attr) ("classpath" ,classpath-devel) @@ -1527,6 +1536,9 @@ new Date();")) (sha256 (base32 "01ihmyf7k5z17wbr7xig7y40l9f01d5zjgkcmawn1102hw5kchpq")) + (patches (search-patches + "openjdk-9-hotspot-pointer-comparison.patch" + "openjdk-9-hotspot-stack-size.patch")) (modules '((guix build utils))) (snippet `(begin @@ -1717,12 +1729,12 @@ new Date();")) (base32 "0zywq2203b4hx4jms9vbwvjcj1d3k2v3qpx4s33729fkpmid97r4")) (patches (search-patches - "openjdk-10-idlj-reproducibility.patch")) + "openjdk-10-idlj-reproducibility.patch" + "openjdk-10-hotspot-pointer-comparison.patch" + "openjdk-10-hotspot-stack-size.patch")) (modules '((guix build utils))) (snippet - `(begin - (for-each delete-file (find-files "." ".*.(bin|exe|jar)$")) - #t)))) + '(for-each delete-file (find-files "." "\\.(bin|exe|jar)$"))))) (arguments (substitute-keyword-arguments (package-arguments openjdk9) ((#:phases phases) @@ -2051,6 +2063,7 @@ new Date();")) (sha256 (base32 "0mbhdrk12b6878kby0flnbak7444dlpm0ihlmf92vk59y1c02bc2")) + (patches (search-patches "openjdk-10-hotspot-stack-size.patch")) (modules '((guix build utils))) (snippet `(begin @@ -2103,6 +2116,7 @@ new Date();")) (url "https://github.com/openjdk/jdk13u") (commit (string-append "jdk-" version "-ga")))) (file-name (git-file-name name version)) + (patches (search-patches "openjdk-10-hotspot-stack-size.patch")) (sha256 (base32 "0wrrr0d7lz1v8qqm752mn4gz5l2vpl2kmx4ac3ysvk4mljc924hp")) @@ -2147,6 +2161,7 @@ new Date();")) (url "https://github.com/openjdk/jdk14u") (commit (string-append "jdk-" version "-ga")))) (file-name (git-file-name name version)) + (patches (search-patches "openjdk-10-hotspot-stack-size.patch")) (sha256 (base32 "07k9bsbxwyf2z2n50z96nvhsdai916mxdxcr5lm44jz7f6xrwfq6")) @@ -2199,7 +2214,8 @@ new Date();")) (base32 "168cr08nywp0q3vyj8njkhsmmnyd8rz9r58hk4xhzdzc6bdfkl1i")) (patches - (search-patches "openjdk-15-xcursor-no-dynamic.patch")))) + (search-patches "openjdk-15-xcursor-no-dynamic.patch" + "openjdk-10-hotspot-stack-size.patch")))) (inputs (cons `("libxcursor" ,libxcursor) ; for our patch to work (package-inputs openjdk14))) @@ -2226,8 +2242,8 @@ new Date();")) (sha256 (base32 "1ggddsbsar4dj2fycfqqqagqil7prhb30afvq6933rz7pa9apm2f")) - (patches - (search-patches "openjdk-15-xcursor-no-dynamic.patch")))) + (patches (search-patches "openjdk-15-xcursor-no-dynamic.patch" + "openjdk-10-hotspot-stack-size.patch")))) (native-inputs `(("autoconf" ,autoconf) ("openjdk15:jdk" ,openjdk15 "jdk") |