Browse Source

remove TOPDIR patch

Waldemar Brodkorb 11 years ago
parent
commit
ef62e6ef5d
2 changed files with 4 additions and 33 deletions
  1. 1 1
      package/openjdk7/Makefile
  2. 3 32
      package/openjdk7/patches/openadk.patch

+ 1 - 1
package/openjdk7/Makefile

@@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
 
 
 PKG_NAME:=		openjdk7
 PKG_NAME:=		openjdk7
 PKG_VERSION:=		2.4.7
 PKG_VERSION:=		2.4.7
-PKG_RELEASE:=		6
+PKG_RELEASE:=		7
 PKG_MD5SUM:=		f6b28633b9978fadc724247cfc264ff0
 PKG_MD5SUM:=		f6b28633b9978fadc724247cfc264ff0
 PKG_DESCR:=		java virtual machine
 PKG_DESCR:=		java virtual machine
 PKG_SECTION:=		dev/lang
 PKG_SECTION:=		dev/lang

+ 3 - 32
package/openjdk7/patches/openadk.patch

@@ -1,6 +1,6 @@
 diff -Nur icedtea-2.4.7.orig/Makefile.in icedtea-2.4.7/Makefile.in
 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.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 @@
 @@ -712,7 +712,7 @@
  	$(am__append_14) $(am__append_15) $(DISTRIBUTION_PATCHES)
  	$(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 \
  	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
 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.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
 +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.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
 ++++ 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();
 +         init0();
 + 
 + 
 +         // start the address listener thread
 +         // 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
 +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.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
 ++++ 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))
 + ifeq ($(PLATFORM), macosx))
 +   CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
 +   CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
 +               -I$(OPENWIN_HOME)/include 
 +               -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
-+