Author: shlevy
Date: Thu Aug 11 01:13:04 2011
New Revision: 28479
URL: https://svn.nixos.org/websvn/nix/?rev=28479&sc=1
Log:
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
Added:
nixpkgs/trunk/pkgs/development/compilers/openjdk/linux-version-check-fix.patch
Modified:
nixpkgs/trunk/pkgs/development/compilers/openjdk/default.nix
Modified: nixpkgs/trunk/pkgs/development/compilers/openjdk/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/openjdk/default.nix Thu Aug
11 01:12:55 2011 (r28478)
+++ nixpkgs/trunk/pkgs/development/compilers/openjdk/default.nix Thu Aug
11 01:13:04 2011 (r28479)
@@ -85,7 +85,11 @@
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"
Added:
nixpkgs/trunk/pkgs/development/compilers/openjdk/linux-version-check-fix.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/development/compilers/openjdk/linux-version-check-fix.patch
Thu Aug 11 01:13:04 2011 (r28479)
@@ -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))
+
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
