mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-25 04:12:44 +03:00
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
This commit is contained in:
parent
11ae27db30
commit
93548e648e
@ -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"
|
||||
|
@ -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))
|
||||
|
Loading…
Reference in New Issue
Block a user