summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-06-23 16:17:45 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-06-23 16:18:13 +0200
commitef62e6ef5da899aeae714816978938d10fa78a91 (patch)
tree1657dc82fad34ca327d1256e2a402825d6a18cc6 /package
parentd35470609e316f21edfd8c06f542425726aceed2 (diff)
remove TOPDIR patch
Diffstat (limited to 'package')
-rw-r--r--package/openjdk7/Makefile2
-rw-r--r--package/openjdk7/patches/openadk.patch35
2 files changed, 4 insertions, 33 deletions
diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile
index 70bcceacc..fb2dd74f5 100644
--- a/package/openjdk7/Makefile
+++ b/package/openjdk7/Makefile
@@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= openjdk7
PKG_VERSION:= 2.4.7
-PKG_RELEASE:= 6
+PKG_RELEASE:= 7
PKG_MD5SUM:= f6b28633b9978fadc724247cfc264ff0
PKG_DESCR:= java virtual machine
PKG_SECTION:= dev/lang
diff --git a/package/openjdk7/patches/openadk.patch b/package/openjdk7/patches/openadk.patch
index 16f4fae8c..0725be908 100644
--- a/package/openjdk7/patches/openadk.patch
+++ b/package/openjdk7/patches/openadk.patch
@@ -1,6 +1,6 @@
diff -Nur icedtea-2.4.7.orig/Makefile.in icedtea-2.4.7/Makefile.in
--- icedtea-2.4.7.orig/Makefile.in 2014-04-16 06:20:44.689988653 +0200
-+++ icedtea-2.4.7/Makefile.in 2014-06-17 17:37:10.283965087 +0200
++++ icedtea-2.4.7/Makefile.in 2014-06-23 12:10:50.943660624 +0200
@@ -712,7 +712,7 @@
$(am__append_14) $(am__append_15) $(DISTRIBUTION_PATCHES)
@@ -12,8 +12,8 @@ diff -Nur icedtea-2.4.7.orig/Makefile.in icedtea-2.4.7/Makefile.in
patches/boot/demos.patch patches/boot/fphexconstants.patch \
diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk.patch
--- icedtea-2.4.7.orig/patches/openadk.patch 1970-01-01 01:00:00.000000000 +0100
-+++ icedtea-2.4.7/patches/openadk.patch 2014-06-17 17:42:10.926234673 +0200
-@@ -0,0 +1,691 @@
++++ icedtea-2.4.7/patches/openadk.patch 2014-06-23 14:30:09.703379765 +0200
+@@ -0,0 +1,662 @@
+diff -Nur openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make
+--- openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make 2014-02-20 19:51:45.000000000 +0100
++++ openjdk/hotspot/make/linux/makefiles/zeroshark.make 2014-06-17 17:39:28.697018938 +0200
@@ -556,20 +556,6 @@ diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk
+ init0();
+
+ // start the address listener thread
-+diff -Nur openjdk.orig/Makefile openjdk/Makefile
-+--- openjdk.orig/Makefile 2014-04-04 19:44:40.000000000 +0200
-++++ openjdk/Makefile 2014-06-17 17:39:28.713019059 +0200
-+@@ -53,9 +53,7 @@
-+ REL_JDK_DEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-debug)/$(JDK_IMAGE_DIRNAME)
-+ REL_JDK_FASTDEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-fastdebug)/$(JDK_IMAGE_DIRNAME)
-+
-+-ifndef TOPDIR
-+- TOPDIR:=.
-+-endif
-++TOPDIR:=.
-+
-+ ifndef JDK_TOPDIR
-+ JDK_TOPDIR=$(TOPDIR)/jdk
+diff -Nur openjdk-boot.orig/hotspot/make/linux/makefiles/vm.make openjdk-boot/hotspot/make/linux/makefiles/vm.make
+--- openjdk-boot.orig/hotspot/make/linux/makefiles/vm.make 2014-02-20 19:51:45.000000000 +0100
++++ openjdk-boot/hotspot/make/linux/makefiles/vm.make 2014-05-01 20:03:03.677930438 +0200
@@ -690,18 +676,3 @@ diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk
+ ifeq ($(PLATFORM), macosx))
+ CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
+ -I$(OPENWIN_HOME)/include
-+diff -Nur openjdk-boot.orig/Makefile openjdk-boot/Makefile
-+--- openjdk-boot.orig/Makefile 2014-04-04 19:44:40.000000000 +0200
-++++ openjdk-boot/Makefile 2014-05-01 20:02:54.549843414 +0200
-+@@ -53,9 +53,7 @@
-+ REL_JDK_DEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-debug)/$(JDK_IMAGE_DIRNAME)
-+ REL_JDK_FASTDEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-fastdebug)/$(JDK_IMAGE_DIRNAME)
-+
-+-ifndef TOPDIR
-+- TOPDIR:=.
-+-endif
-++TOPDIR:=.
-+
-+ ifndef JDK_TOPDIR
-+ JDK_TOPDIR=$(TOPDIR)/jdk
-+