From 447f1dcffb8cc1c78ee631a47d272dd767f69396 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Tue, 21 Apr 2015 20:39:36 -0700 Subject: [PATCH] openjdk: patch build script to accept 4.x versioned linux kernels --- pkgs/development/compilers/openjdk/default.nix | 1 + pkgs/development/compilers/openjdk/linux-4.0.patch | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 pkgs/development/compilers/openjdk/linux-4.0.patch diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index 8ba2b3a379fd..ec095bb4efa3 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -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; diff --git a/pkgs/development/compilers/openjdk/linux-4.0.patch b/pkgs/development/compilers/openjdk/linux-4.0.patch new file mode 100644 index 000000000000..c3d7cf8b6ca5 --- /dev/null +++ b/pkgs/development/compilers/openjdk/linux-4.0.patch @@ -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)) +