mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 21:50:55 +00:00
Code Issues Wiki Activity

openjdk: patch build script to accept 4.x versioned linux kernels

Browse source
This commit is contained in:
Cray Elliott 2015-04-21 20:39:36 -07:00
parent 7dddf8a68c
commit 447f1dcffb
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/development/compilers/openjdk/default.nix
View file

@ -65,6 +65,7 @@ let
./paxctl.patch
./read-truststore-from-env.patch
./currency-date-range.patch
./linux-4.0.patch
];
NIX_NO_SELF_RPATH = true;

12
pkgs/development/compilers/openjdk/linux-4.0.patch Normal file
View file

@ -0,0 +1,12 @@
diff -Naur openjdk-7u65-b32/hotspot/make/linux/Makefile openjdk-7u65-b32-patch/hotspot/make/linux/Makefile
--- openjdk-7u65-b32/hotspot/make/linux/Makefile 2014-07-17 03:08:38.000000000 -0700
+++ openjdk-7u65-b32-patch/hotspot/make/linux/Makefile 2015-04-21 05:33:12.170190385 -0700
@@ -231,7 +231,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))