diff options
| author | Shea Levy <shea@shealevy.com> | 2011-08-11 01:13:04 +0000 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2011-08-11 01:13:04 +0000 |
| commit | 93548e648ea5ba237ce7a8cecc4d925c652dd9dc (patch) | |
| tree | bf936322049b07adb3b7d6f7cf83109870dd1957 /pkgs/development/compilers/openjdk | |
| parent | 11ae27db307222ba59c134b6ff99dac27739c1fc (diff) | |
| download | nixlib-93548e648ea5ba237ce7a8cecc4d925c652dd9dc.tar nixlib-93548e648ea5ba237ce7a8cecc4d925c652dd9dc.tar.gz nixlib-93548e648ea5ba237ce7a8cecc4d925c652dd9dc.tar.bz2 nixlib-93548e648ea5ba237ce7a8cecc4d925c652dd9dc.tar.lz nixlib-93548e648ea5ba237ce7a8cecc4d925c652dd9dc.tar.xz nixlib-93548e648ea5ba237ce7a8cecc4d925c652dd9dc.tar.zst nixlib-93548e648ea5ba237ce7a8cecc4d925c652dd9dc.zip | |
openjdk: Add a patch to fix a stupid linux version check
Hopefully by the time the Linux 4.x series drops we'll have a better openjdk build system svn path=/nixpkgs/trunk/; revision=28479
Diffstat (limited to 'pkgs/development/compilers/openjdk')
| -rw-r--r-- | pkgs/development/compilers/openjdk/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/compilers/openjdk/linux-version-check-fix.patch | 12 |
2 files changed, 17 insertions, 1 deletions
diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index 168cc7af8a60..e14ed44cef33 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -85,7 +85,11 @@ stdenv.mkDerivation rec { openjdk/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c ''; - patches = [ ./cppflags-include-fix.patch ./printf-fix.patch ]; + patches = [ + ./cppflags-include-fix.patch + ./printf-fix.patch + ./linux-version-check-fix.patch + ]; makeFlags = [ "SORT=${coreutils}/bin/sort" diff --git a/pkgs/development/compilers/openjdk/linux-version-check-fix.patch b/pkgs/development/compilers/openjdk/linux-version-check-fix.patch new file mode 100644 index 000000000000..9d749a198e3f --- /dev/null +++ b/pkgs/development/compilers/openjdk/linux-version-check-fix.patch @@ -0,0 +1,12 @@ +diff -Naur openjdk-orig/hotspot/make/linux/Makefile openjdk/hotspot/make/linux/Makefile +--- openjdk-orig/hotspot/make/linux/Makefile 2011-06-27 12:10:07.000000000 -0400 ++++ openjdk/hotspot/make/linux/Makefile 2011-08-10 20:08:40.879752771 -0400 +@@ -230,7 +230,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% 2.7% ++SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 2.7% 3% + OS_VERSION := $(shell uname -r) + EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION)) + |