From eb6c8aec62486817a8e4898d924ec0e580dc182d Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 22 Jan 2013 12:58:07 -0500 Subject: [PATCH] openjdk: Update to 7u6b24 --- .../openjdk/cppflags-include-fix.patch | 16 ++++---- .../development/compilers/openjdk/default.nix | 41 +++---------------- .../openjdk/linux-version-check-fix.patch | 12 ------ .../compilers/openjdk/printf-fix.patch | 12 ------ 4 files changed, 14 insertions(+), 67 deletions(-) delete mode 100644 pkgs/development/compilers/openjdk/linux-version-check-fix.patch delete mode 100644 pkgs/development/compilers/openjdk/printf-fix.patch diff --git a/pkgs/development/compilers/openjdk/cppflags-include-fix.patch b/pkgs/development/compilers/openjdk/cppflags-include-fix.patch index 36fa9054bc6..8931c122538 100644 --- a/pkgs/development/compilers/openjdk/cppflags-include-fix.patch +++ b/pkgs/development/compilers/openjdk/cppflags-include-fix.patch @@ -1,9 +1,9 @@ diff -Naur openjdk-orig/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk ---- openjdk-orig/jdk/make/sun/awt/mawt.gmk 2011-06-27 13:19:26.000000000 -0400 -+++ openjdk/jdk/make/sun/awt/mawt.gmk 2011-07-31 17:42:11.370026854 -0400 -@@ -223,12 +223,6 @@ - -I$(PLATFORM_SRC)/native/$(PKGDIR) \ - $(EVENT_MODEL) +--- openjdk-orig/jdk/make/sun/awt/mawt.gmk 2012-08-28 19:13:16.000000000 -0400 ++++ openjdk/jdk/make/sun/awt/mawt.gmk 2013-01-22 11:56:22.315418708 -0500 +@@ -234,12 +234,6 @@ + endif # !HEADLESS + endif # PLATFORM -ifeq ($(PLATFORM), linux) - # Checking for the X11/extensions headers at the additional location @@ -11,6 +11,6 @@ diff -Naur openjdk-orig/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt. - $(wildcard /usr/include/X11/extensions)) -endif - - ifeq ($(PLATFORM), solaris) - CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions - endif + ifeq ($(PLATFORM), macosx)) + CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \ + -I$(OPENWIN_HOME)/include diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index a1cb2f7fe19..0be36379f33 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -39,37 +39,18 @@ let else throw "openjdk requires i686-linux or x86_64 linux"; - build = "147"; + update = "6"; + + build = "24"; in stdenv.mkDerivation rec { - name = "openj${if jreOnly then "re" else "dk"}-7b${build}"; + name = "openj${if jreOnly then "re" else "dk"}-7u${update}b${build}"; src = fetchurl { - url = "http://www.java.net/download/openjdk/jdk7/promoted/b${build}/openjdk-7-fcs-src-b${build}-27_jun_2011.zip"; - sha256 = "1qhwlz9y5qmwmja4qnxg6sn3pgsg1i11fb9j41w8l26acyhk34rs"; - }; - - jaxws_src_name = "jdk7-jaxws2_2_4-b03-2011_05_27.zip"; - - jaxws_src = fetchurl { - url = "http://download.java.net/glassfish/components/jax-ws/openjdk/jdk7/${jaxws_src_name}"; - sha256 = "1mpzgr9lnbf2p3x45npcniy47kbzi3hyqqbd4w3j63sxnxcp5bh5"; - }; - - jaxp_src_name = "jaxp145_01.zip"; - - jaxp_src = fetchurl { - url = "http://download.java.net/jaxp/1.4.5/${jaxp_src_name}"; - sha256 = "1js8m1a6lcn95byplmjjs1lja1maisyl6lgfjy1jx3lqi1hlr4n5"; - }; - - jaf_src_name = "jdk7-jaf-2010_08_19.zip"; - - jaf_src = fetchurl { - url = "http://java.net/downloads/jax-ws/JDK7/${jaf_src_name}"; - sha256 = "17n0i5cgvfsd6ric70h3n7hr8aqnzd216gaq3603wrxlvggzxbp6"; + url = "http://www.java.net/download/openjdk/jdk7u6/promoted/b24/openjdk-7u6-fcs-src-b24-28_aug_2012.zip"; + sha256 = "1x1iq8ga0hqqh0bpcmydzzy19757hknn2yvgzib85p7b7dx0vfx9"; }; # outputs = [ "out" ] ++ stdenv.lib.optionals (! jreOnly) [ "jre" ]; @@ -98,12 +79,6 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lfontconfig -lXcursor -lXinerama"; postUnpack = '' - mkdir -p drops - cp ${jaxp_src} drops/${jaxp_src_name} - cp ${jaxws_src} drops/${jaxws_src_name} - cp ${jaf_src} drops/${jaf_src_name} - export DROPS_PATH=$(pwd)/drops - sed -i -e "s@/usr/bin/test@${coreutils}/bin/test@" \ -e "s@/bin/ls@${coreutils}/bin/ls@" \ openjdk/hotspot/make/linux/makefiles/sa.make @@ -117,8 +92,6 @@ stdenv.mkDerivation rec { patches = [ ./cppflags-include-fix.patch - ./printf-fix.patch - ./linux-version-check-fix.patch ./no-crypto-restrictions.patch ]; @@ -135,7 +108,6 @@ stdenv.mkDerivation rec { "DEVTOOLS_PATH=" "UNIXCOMMAND_PATH=" "BOOTDIR=${jdk}" - "DROPS_DIR=$(DROPS_PATH)" ]; configurePhase = '' @@ -172,4 +144,3 @@ stdenv.mkDerivation rec { passthru = { inherit architecture; }; } - diff --git a/pkgs/development/compilers/openjdk/linux-version-check-fix.patch b/pkgs/development/compilers/openjdk/linux-version-check-fix.patch deleted file mode 100644 index 9d749a198e3..00000000000 --- a/pkgs/development/compilers/openjdk/linux-version-check-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -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)) - diff --git a/pkgs/development/compilers/openjdk/printf-fix.patch b/pkgs/development/compilers/openjdk/printf-fix.patch deleted file mode 100644 index 3d66962a119..00000000000 --- a/pkgs/development/compilers/openjdk/printf-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur openjdk-orig/make/Defs-internal.gmk openjdk/make/Defs-internal.gmk ---- openjdk-orig/make/Defs-internal.gmk 2011-06-27 11:44:06.000000000 -0400 -+++ openjdk/make/Defs-internal.gmk 2011-07-31 18:30:15.784506762 -0400 -@@ -79,7 +79,7 @@ - # Find all build_time_* files and print their contents in a list sorted - # on the name of the sub repository. - define ReportBuildTimes --$(PRINTF) "-- Build times ----------\nTarget %s\nStart %s\nEnd %s\n%s\n%s\n-------------------------\n" \ -+$(PRINTF) -- "-- Build times ----------\nTarget %s\nStart %s\nEnd %s\n%s\n%s\n-------------------------\n" \ - $1 \ - "`$(CAT) $(BUILDTIMESDIR)/build_time_start_TOTAL_human_readable`" \ - "`$(CAT) $(BUILDTIMESDIR)/build_time_end_TOTAL_human_readable`" \