icedtea6-native: use the right variable for zip and override it via make commandline

* bump INC_PR

5 files changed, 2 insertions, 32 deletions

diff --git a/recipes/icedtea/icedtea6-native-1.7.3/icedtea-oe-path.patch b/recipes/icedtea/icedtea6-native-1.7.3/icedtea-oe-path.patch
deleted file mode 100644
index ad25472851..0000000000
--- a/recipes/icedtea/icedtea6-native-1.7.3/icedtea-oe-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: openjdk/jdk/make/common/shared/Defs-utils.gmk
-===================================================================
---- openjdk/jdk/make/common/shared/Defs-utils.gmk	2010-07-15 18:22:59.731376457 +0200
-+++ openjdk/jdk/make/common/shared/Defs-utils.gmk	2010-07-15 18:24:09.784285551 +0200
-@@ -146,7 +146,7 @@
- WC             = $(UTILS_USR_BIN_PATH)wc
- WHICH          = $(UTILS_USR_BIN_PATH)which
- YACC           = $(UTILS_CCS_BIN_PATH)yacc
--ZIPEXE         = $(UTILS_DEVTOOL_PATH)zip
-+ZIPEXE         = $(STAGING_BINDIR_NATIVE)zip
- 
- # Special cases
- #RM   is defined by GNU Make as 'rm -f'
diff --git a/recipes/icedtea/icedtea6-native-1.8/icedtea-oe-path.patch b/recipes/icedtea/icedtea6-native-1.8/icedtea-oe-path.patch
deleted file mode 100644
index ad25472851..0000000000
--- a/recipes/icedtea/icedtea6-native-1.8/icedtea-oe-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: openjdk/jdk/make/common/shared/Defs-utils.gmk
-===================================================================
---- openjdk/jdk/make/common/shared/Defs-utils.gmk	2010-07-15 18:22:59.731376457 +0200
-+++ openjdk/jdk/make/common/shared/Defs-utils.gmk	2010-07-15 18:24:09.784285551 +0200
-@@ -146,7 +146,7 @@
- WC             = $(UTILS_USR_BIN_PATH)wc
- WHICH          = $(UTILS_USR_BIN_PATH)which
- YACC           = $(UTILS_CCS_BIN_PATH)yacc
--ZIPEXE         = $(UTILS_DEVTOOL_PATH)zip
-+ZIPEXE         = $(STAGING_BINDIR_NATIVE)zip
- 
- # Special cases
- #RM   is defined by GNU Make as 'rm -f'
diff --git a/recipes/icedtea/icedtea6-native.inc b/recipes/icedtea/icedtea6-native.inc
index 4ee792adb7..53fb43f9bd 100644
--- a/recipes/icedtea/icedtea6-native.inc
+++ b/recipes/icedtea/icedtea6-native.inc
@@ -1,7 +1,7 @@
 DESCRIPTION = "Harness to build the source code from OpenJDK using Free Software build tools"
 HOMEPAGE = "http://icedtea.classpath.org"
 LICENSE  = "GPL with Classpath Exception"
-INC_PR = "r1"
+INC_PR = "r2"
 
 DEPENDS = "virtual/javac-native classpath-tools-native \
 	   virtual/java-native classpath-native \
@@ -105,7 +105,7 @@ do_configure_append() {
 }
 
 EXTRA_OEMAKE = ' \
-                STAGING_BINDIR_NATIVE="${STAGING_BINDIR_NATIVE}/" \
+                ZIPEXE="${STAGING_BINDIR_NATIVE}/zip" \
                '
 
 do_compile() {
diff --git a/recipes/icedtea/icedtea6-native_1.7.3.bb b/recipes/icedtea/icedtea6-native_1.7.3.bb
index 16575a4380..9ac7aa6e5b 100644
--- a/recipes/icedtea/icedtea6-native_1.7.3.bb
+++ b/recipes/icedtea/icedtea6-native_1.7.3.bb
@@ -24,7 +24,6 @@ ICEDTEA_PATCHES = "\
 	file://icedtea-hotspot-make-arch-sane-for-x86.patch;apply=no \
 	file://icedtea-jdk-sane-x86-arch.patch;apply=no \
 	file://icedtea-unbreak-float.patch;apply=no \
-        file://icedtea-oe-path.patch;apply=no \
 	"
 
 export DISTRIBUTION_PATCHES = "\
@@ -34,5 +33,4 @@ export DISTRIBUTION_PATCHES = "\
 	patches/icedtea-hotspot-make-arch-sane-for-x86.patch \
 	patches/icedtea-jdk-sane-x86-arch.patch \
 	patches/icedtea-unbreak-float.patch \
-        patches/icedtea-oe-path.patch \
 	"
diff --git a/recipes/icedtea/icedtea6-native_1.8.bb b/recipes/icedtea/icedtea6-native_1.8.bb
index 61cf6e673b..67c26321ce 100644
--- a/recipes/icedtea/icedtea6-native_1.8.bb
+++ b/recipes/icedtea/icedtea6-native_1.8.bb
@@ -42,7 +42,6 @@ ICEDTEA_PATCHES = "\
         file://icedtea-hotspot-make-arch-sane-for-x86.patch;apply=no \
         file://icedtea-jdk-sane-x86-arch.patch;apply=no \
         file://icedtea-unbreak-float.patch;apply=no \
-        file://icedtea-oe-path.patch;apply=no \
 	"
 
 export DISTRIBUTION_PATCHES = "\
@@ -52,7 +51,6 @@ export DISTRIBUTION_PATCHES = "\
 	patches/icedtea-hotspot-make-arch-sane-for-x86.patch \
         patches/icedtea-jdk-sane-x86-arch.patch \
 	patches/icedtea-unbreak-float.patch \
-        patches/icedtea-oe-path.patch \
 	"
 
 EXTRA_OECONF += " --with-jaxws-drop-zip=${DL_DIR}/jdk6-jaxws-2009_10_27.zip \