diff options
| author | Pascal Wittmann <mail@pascal-wittmann.de> | 2015-05-31 18:01:23 +0200 |
|---|---|---|
| committer | Pascal Wittmann <mail@pascal-wittmann.de> | 2015-05-31 18:02:41 +0200 |
| commit | d780e48b3104cd5585a87665854803e42a664941 (patch) | |
| tree | b34f003e8cb5cb9c23e1879ada01b7c9b21f49cb | |
| parent | 81a79f9d033fbd64f3868bf350ac2b0733c9e7ff (diff) | |
| download | nixlib-d780e48b3104cd5585a87665854803e42a664941.tar nixlib-d780e48b3104cd5585a87665854803e42a664941.tar.gz nixlib-d780e48b3104cd5585a87665854803e42a664941.tar.bz2 nixlib-d780e48b3104cd5585a87665854803e42a664941.tar.lz nixlib-d780e48b3104cd5585a87665854803e42a664941.tar.xz nixlib-d780e48b3104cd5585a87665854803e42a664941.tar.zst nixlib-d780e48b3104cd5585a87665854803e42a664941.zip | |
openjdk8: fix build by applying the patch from debian
see https://www.mail-archive.com/debian-bugs-rc@lists.debian.org/msg389555.html closes #8090
| -rw-r--r-- | pkgs/development/compilers/openjdk/JDK-8074312-hotspot.patch | 11 | ||||
| -rw-r--r-- | pkgs/development/compilers/openjdk/openjdk8.nix | 2 |
2 files changed, 13 insertions, 0 deletions
diff --git a/pkgs/development/compilers/openjdk/JDK-8074312-hotspot.patch b/pkgs/development/compilers/openjdk/JDK-8074312-hotspot.patch new file mode 100644 index 000000000000..85722a1d365b --- /dev/null +++ b/pkgs/development/compilers/openjdk/JDK-8074312-hotspot.patch @@ -0,0 +1,11 @@ +diff -r 61edd5c7412e make/linux/Makefile +--- a/hotspot/make/linux/Makefile Mon Mar 02 18:12:06 2015 +0000 ++++ b/hotspot/make/linux/Makefile Tue Mar 03 15:58:13 2015 +0100 +@@ -233,7 +233,7 @@ + # Solaris 2.5.1, 2.6). + # Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok. + +-SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% ++SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% 4% + OS_VERSION := $(shell uname -r) + EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION)) diff --git a/pkgs/development/compilers/openjdk/openjdk8.nix b/pkgs/development/compilers/openjdk/openjdk8.nix index b0dae2512a5b..c27808661613 100644 --- a/pkgs/development/compilers/openjdk/openjdk8.nix +++ b/pkgs/development/compilers/openjdk/openjdk8.nix @@ -65,6 +65,8 @@ let ./fix-java-home-jdk8.patch ./read-truststore-from-env-jdk8.patch ./currency-date-range-jdk8.patch + ./JDK-8074312-hotspot.patch + ]; preConfigure = '' chmod +x configure |