use unzip/zip from adk

1 files changed, 56 insertions, 18 deletions

diff --git a/package/openjdk7/patches/openadk.patch b/package/openjdk7/patches/openadk.patch
index 03df265e1..e6a83cc7b 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-23 16:45:35.584475680 +0200
+--- icedtea-2.4.7.orig/Makefile.in	2014-04-15 23:20:44.689988653 -0500
++++ icedtea-2.4.7/Makefile.in	2015-01-15 20:05:28.339161934 -0600
 @@ -712,7 +712,7 @@
  	$(am__append_14) $(am__append_15) $(DISTRIBUTION_PATCHES)
  
@@ -20,9 +20,9 @@ diff -Nur icedtea-2.4.7.orig/Makefile.in icedtea-2.4.7/Makefile.in
  @BUILD_JAMVM_TRUE@	$(MAKE) install
  @BUILD_JAMVM_TRUE@	mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server
 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-24 12:36:26.511108017 +0200
-@@ -0,0 +1,705 @@
+--- icedtea-2.4.7.orig/patches/openadk.patch	1969-12-31 18:00:00.000000000 -0600
++++ icedtea-2.4.7/patches/openadk.patch	2015-01-15 20:47:04.615139096 -0600
+@@ -0,0 +1,743 @@
 +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
@@ -607,9 +607,28 @@ diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk
 ++-classic WARN
 ++-native ERROR
 ++-green ERROR
++diff -Nur openjdk-boot.orig/corba/make/common/shared/Defs-utils.gmk openjdk-boot/corba/make/common/shared/Defs-utils.gmk
++--- openjdk-boot.orig/corba/make/common/shared/Defs-utils.gmk	2014-01-21 06:46:58.000000000 -0600
+++++ openjdk-boot/corba/make/common/shared/Defs-utils.gmk	2015-01-15 20:14:56.947156399 -0600
++@@ -136,12 +136,12 @@
++ TRUE           = $(UTILS_COMMAND_PATH)true
++ UNAME          = $(UTILS_COMMAND_PATH)uname
++ UNIQ           = $(UTILS_USR_BIN_PATH)uniq
++-UNZIP          = $(UTILS_USR_BIN_PATH)unzip
++-UNZIPSFX       = $(UTILS_DEVTOOL_PATH)unzipsfx
+++UNZIP          = unzip
+++UNZIPSFX       = unzipsfx
++ WC             = $(UTILS_USR_BIN_PATH)wc
++ WHICH          = $(UTILS_USR_BIN_PATH)which
++ YACC           = $(UTILS_CCS_BIN_PATH)yacc
++-ZIPEXE         = $(UTILS_DEVTOOL_PATH)zip
+++ZIPEXE         = zip
++ 
++ # Special cases
++ #RM   is defined by GNU Make as 'rm -f'
 +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
++--- openjdk-boot.orig/hotspot/make/linux/makefiles/vm.make	2014-02-20 12:51:45.000000000 -0600
+++++ openjdk-boot/hotspot/make/linux/makefiles/vm.make	2015-01-15 20:12:14.711157805 -0600
 +@@ -288,7 +288,7 @@
 +   LIBS_VM                  += $(LIBS)
 + endif
@@ -620,8 +639,8 @@ diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk
 + endif
 + 
 +diff -Nur openjdk-boot.orig/hotspot/make/linux/makefiles/zero.make openjdk-boot/hotspot/make/linux/makefiles/zero.make
-+--- openjdk-boot.orig/hotspot/make/linux/makefiles/zero.make	2014-02-20 19:51:45.000000000 +0100
-++++ openjdk-boot/hotspot/make/linux/makefiles/zero.make	2014-05-01 20:03:03.677930438 +0200
++--- openjdk-boot.orig/hotspot/make/linux/makefiles/zero.make	2014-02-20 12:51:45.000000000 -0600
+++++ openjdk-boot/hotspot/make/linux/makefiles/zero.make	2015-01-15 20:12:14.711157805 -0600
 +@@ -33,4 +33,4 @@
 + 
 + # Make sure libffi is included
@@ -629,8 +648,8 @@ diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk
 +-LIBS_VM += $(LIBFFI_LIBS)
 ++LIBS_VM += $(FFI_LDFLAGS) -Wl,-Bstatic $(LIBFFI_LIBS) -Wl,-Bdynamic
 +diff -Nur openjdk-boot.orig/jdk/make/common/Sanity.gmk openjdk-boot/jdk/make/common/Sanity.gmk
-+--- openjdk-boot.orig/jdk/make/common/Sanity.gmk	2014-04-12 01:23:06.000000000 +0200
-++++ openjdk-boot/jdk/make/common/Sanity.gmk	2014-05-01 20:03:03.677930438 +0200
++--- openjdk-boot.orig/jdk/make/common/Sanity.gmk	2014-04-11 18:23:06.000000000 -0500
+++++ openjdk-boot/jdk/make/common/Sanity.gmk	2015-01-15 20:12:14.711157805 -0600
 +@@ -91,8 +91,7 @@
 +     sane-ld_run_path \
 +     sane-alt_bootdir \
@@ -641,9 +660,29 @@ diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk
 + 
 + ifdef OPENJDK
 + sanity-all:: sane-freetype 
++diff -Nur openjdk-boot.orig/jdk/make/common/shared/Defs-utils.gmk openjdk-boot/jdk/make/common/shared/Defs-utils.gmk
++--- openjdk-boot.orig/jdk/make/common/shared/Defs-utils.gmk	2014-04-11 18:23:06.000000000 -0500
+++++ openjdk-boot/jdk/make/common/shared/Defs-utils.gmk	2015-01-15 20:45:49.051139347 -0600
++@@ -153,13 +153,13 @@
++ TRUE           = $(UTILS_COMMAND_PATH)true
++ UNAME          = $(UTILS_COMMAND_PATH)uname
++ UNIQ           = $(UTILS_USR_BIN_PATH)uniq
++-UNZIP          = $(UTILS_USR_BIN_PATH)unzip
++-UNZIPSFX       = $(UTILS_DEVTOOL_PATH)unzipsfx
+++UNZIP          = unzip
+++UNZIPSFX       = unzipsfx
++ XARGS          = $(UTILS_USR_BIN_PATH)xargs
++ WC             = $(UTILS_USR_BIN_PATH)wc
++ WHICH          = $(UTILS_USR_BIN_PATH)which
++ YACC           = $(UTILS_CCS_BIN_PATH)yacc
++-ZIPEXE         = $(UTILS_DEVTOOL_PATH)zip
+++ZIPEXE         = zip
++ 
++ # Special cases
++ #RM   is defined by GNU Make as 'rm -f'
 +diff -Nur openjdk-boot.orig/jdk/make/common/shared/Sanity.gmk openjdk-boot/jdk/make/common/shared/Sanity.gmk
-+--- openjdk-boot.orig/jdk/make/common/shared/Sanity.gmk	2014-04-12 01:23:06.000000000 +0200
-++++ openjdk-boot/jdk/make/common/shared/Sanity.gmk	2014-05-01 20:03:03.681930476 +0200
++--- openjdk-boot.orig/jdk/make/common/shared/Sanity.gmk	2014-04-11 18:23:06.000000000 -0500
+++++ openjdk-boot/jdk/make/common/shared/Sanity.gmk	2015-01-15 20:12:14.715157805 -0600
 +@@ -114,11 +114,6 @@
 +     elif [ -f /etc/lsb-release ] ; then \
 +       $(EGREP) DISTRIB_RELEASE /etc/lsb-release | $(SED) -e 's@.*DISTRIB_RELEASE=\(.*\)@\1@'; \
@@ -701,8 +740,8 @@ diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk
 + $(SANITY_FILES):
 + 	-@$(prep-target)
 +diff -Nur openjdk-boot.orig/jdk/make/javax/sound/jsoundalsa/Makefile openjdk-boot/jdk/make/javax/sound/jsoundalsa/Makefile
-+--- openjdk-boot.orig/jdk/make/javax/sound/jsoundalsa/Makefile	2014-04-12 01:23:06.000000000 +0200
-++++ openjdk-boot/jdk/make/javax/sound/jsoundalsa/Makefile	2014-05-15 15:49:03.886269427 +0200
++--- openjdk-boot.orig/jdk/make/javax/sound/jsoundalsa/Makefile	2014-04-11 18:23:06.000000000 -0500
+++++ openjdk-boot/jdk/make/javax/sound/jsoundalsa/Makefile	2015-01-15 20:12:14.715157805 -0600
 +@@ -72,6 +72,7 @@
 + 	-DUSE_PORTS=TRUE  \
 + 	-DUSE_PLATFORM_MIDI_OUT=TRUE \
@@ -712,8 +751,8 @@ diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk
 + 
 + #
 +diff -Nur openjdk-boot.orig/jdk/make/sun/awt/mawt.gmk openjdk-boot/jdk/make/sun/awt/mawt.gmk
-+--- openjdk-boot.orig/jdk/make/sun/awt/mawt.gmk	2014-04-12 01:23:06.000000000 +0200
-++++ openjdk-boot/jdk/make/sun/awt/mawt.gmk	2014-05-01 20:03:03.681930476 +0200
++--- openjdk-boot.orig/jdk/make/sun/awt/mawt.gmk	2014-04-11 18:23:06.000000000 -0500
+++++ openjdk-boot/jdk/make/sun/awt/mawt.gmk	2015-01-15 20:12:14.715157805 -0600
 +@@ -270,12 +270,6 @@
 + endif # !HEADLESS
 + endif # PLATFORM
@@ -727,4 +766,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 
-+