diff options
author | Amy Fong <amy.fong@windriver.com> | 2015-04-16 18:24:53 -0400 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2016-01-04 09:21:07 -0200 |
commit | 6273537d06b9df611a2f41b3de6e552941e1cf94 (patch) | |
tree | 08d55e19f7f0b75a96a941709135b0fabf41672f /recipes-core/openjdk | |
parent | 23ae934ae40898e1910d3e126a7796b9b2feec36 (diff) | |
download | meta-java-6273537d06b9df611a2f41b3de6e552941e1cf94.tar.gz |
icedtea7-native/openjdk-7: fails on hosts with no unzip
Fails with an error message /usr/bin/unzip not found.
Additionally, icedtea7 enables you to specify an unzip to use by setting
the variable UNZIP, this results in an error because unzip uses UNZIP
to specify options, hence you'll end up with unzip trying to unzip unzip.
Note: Same issue applies to openjdk
Signed-off-by: Amy Fong <amy.fong@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Diffstat (limited to 'recipes-core/openjdk')
4 files changed, 311 insertions, 0 deletions
diff --git a/recipes-core/openjdk/openjdk-7-common.inc b/recipes-core/openjdk/openjdk-7-common.inc index a928103..718fc1a 100644 --- a/recipes-core/openjdk/openjdk-7-common.inc +++ b/recipes-core/openjdk/openjdk-7-common.inc | |||
@@ -109,6 +109,7 @@ EXTRA_OECONF = " \ | |||
109 | \ | 109 | \ |
110 | --with-pkgversion=${PV} \ | 110 | --with-pkgversion=${PV} \ |
111 | --with-cc-for-build=${BUILD_CC} \ | 111 | --with-cc-for-build=${BUILD_CC} \ |
112 | ac_cv_path_UNZIP_BIN="${STAGING_BINDIR_NATIVE}/unzip" \ | ||
112 | " | 113 | " |
113 | 114 | ||
114 | # PCSC default value was changed to true and SCTP was added during the 2.6.0 | 115 | # PCSC default value was changed to true and SCTP was added during the 2.6.0 |
@@ -149,6 +150,7 @@ EXTRA_OEMAKE += ' \ | |||
149 | CROSS_COMPILE_ARCH="${JDK_ARCH}" \ | 150 | CROSS_COMPILE_ARCH="${JDK_ARCH}" \ |
150 | REQUIRED_ALSA_VERSION="" \ | 151 | REQUIRED_ALSA_VERSION="" \ |
151 | DISABLE_HOTSPOT_OS_VERSION_CHECK=ok \ | 152 | DISABLE_HOTSPOT_OS_VERSION_CHECK=ok \ |
153 | UNZIP_BIN="${STAGING_BINDIR_NATIVE}/unzip" \ | ||
152 | ' | 154 | ' |
153 | 155 | ||
154 | # Provides the target architecture to the configure script. | 156 | # Provides the target architecture to the configure script. |
diff --git a/recipes-core/openjdk/openjdk-7_91b01-2.6.2.bb b/recipes-core/openjdk/openjdk-7_91b01-2.6.2.bb index 854d179..1431301 100644 --- a/recipes-core/openjdk/openjdk-7_91b01-2.6.2.bb +++ b/recipes-core/openjdk/openjdk-7_91b01-2.6.2.bb | |||
@@ -47,6 +47,7 @@ SRC_URI[hotspot.sha256sum] = "39bc54bf343e1dce404b8c95285c0457a8d0a7c7aedfb55055 | |||
47 | OEPATCHES = "\ | 47 | OEPATCHES = "\ |
48 | file://build-hacks.patch \ | 48 | file://build-hacks.patch \ |
49 | file://fix_hotspot_crosscompile.patch \ | 49 | file://fix_hotspot_crosscompile.patch \ |
50 | file://icedtea-makefile-unzip.patch \ | ||
50 | " | 51 | " |
51 | 52 | ||
52 | ICEDTEAPATCHES = "\ | 53 | ICEDTEAPATCHES = "\ |
@@ -55,6 +56,7 @@ ICEDTEAPATCHES = "\ | |||
55 | file://icedtea-jdk-rmi-crosscompile.patch;apply=no \ | 56 | file://icedtea-jdk-rmi-crosscompile.patch;apply=no \ |
56 | file://icedtea-crosscompile-fix.patch;apply=no \ | 57 | file://icedtea-crosscompile-fix.patch;apply=no \ |
57 | file://icedtea-xawt-crosscompile-fix.patch;apply=no \ | 58 | file://icedtea-xawt-crosscompile-fix.patch;apply=no \ |
59 | file://icedtea-jdk-unzip.patch;apply=no \ | ||
58 | " | 60 | " |
59 | 61 | ||
60 | DISTRIBUTION_PATCHES = "\ | 62 | DISTRIBUTION_PATCHES = "\ |
@@ -63,6 +65,7 @@ DISTRIBUTION_PATCHES = "\ | |||
63 | patches/icedtea-jdk-rmi-crosscompile.patch \ | 65 | patches/icedtea-jdk-rmi-crosscompile.patch \ |
64 | patches/icedtea-crosscompile-fix.patch \ | 66 | patches/icedtea-crosscompile-fix.patch \ |
65 | patches/icedtea-xawt-crosscompile-fix.patch \ | 67 | patches/icedtea-xawt-crosscompile-fix.patch \ |
68 | patches/icedtea-jdk-unzip.patch \ | ||
66 | " | 69 | " |
67 | 70 | ||
68 | export DISTRIBUTION_PATCHES | 71 | export DISTRIBUTION_PATCHES |
diff --git a/recipes-core/openjdk/patches-openjdk-7/icedtea-jdk-unzip.patch b/recipes-core/openjdk/patches-openjdk-7/icedtea-jdk-unzip.patch new file mode 100644 index 0000000..8c29730 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-7/icedtea-jdk-unzip.patch | |||
@@ -0,0 +1,130 @@ | |||
1 | Use UNZIP_BIN instead of UNZIP. | ||
2 | |||
3 | Fails with an error message /usr/bin/unzip not found. | ||
4 | Additionally, icedtea7 enables you to specify an unzip to use by setting | ||
5 | the variable UNZIP, this results in an error because unzip uses UNZIP | ||
6 | to specify options, hence you'll end up with unzip trying to unzip unzip. | ||
7 | |||
8 | Upstream-Status: Inappropriate | ||
9 | |||
10 | Signed-off-by: Amy Fong <amy.fong@windriver.com> | ||
11 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | ||
12 | --- | ||
13 | openjdk/corba/make/common/shared/Defs-utils.gmk | 6 +++--- | ||
14 | openjdk/jdk/make/common/Demo.gmk | 2 +- | ||
15 | openjdk/jdk/make/common/Release.gmk | 2 +- | ||
16 | openjdk/jdk/make/common/internal/ImportComponents.gmk | 4 ++-- | ||
17 | openjdk/jdk/make/common/shared/Defs-utils.gmk | 6 +++--- | ||
18 | openjdk/jdk/make/common/shared/Sanity.gmk | 2 +- | ||
19 | openjdk/jdk/make/java/redist/Makefile | 4 ++-- | ||
20 | 7 files changed, 13 insertions(+), 13 deletions(-) | ||
21 | |||
22 | --- openjdk/corba/make/common/shared/Defs-utils.gmk | ||
23 | +++ openjdk/corba/make/common/shared/Defs-utils.gmk | ||
24 | @@ -129,7 +129,7 @@ | ||
25 | TRUE = $(UTILS_COMMAND_PATH)true | ||
26 | UNAME = $(UTILS_COMMAND_PATH)uname | ||
27 | UNIQ = $(UTILS_USR_BIN_PATH)uniq | ||
28 | -UNZIP = $(UTILS_USR_BIN_PATH)unzip | ||
29 | +# UNZIP = $(UTILS_USR_BIN_PATH)unzip | ||
30 | UNZIPSFX = $(UTILS_DEVTOOL_PATH)unzipsfx | ||
31 | WC = $(UTILS_USR_BIN_PATH)wc | ||
32 | WHICH = $(UTILS_USR_BIN_PATH)which | ||
33 | @@ -146,10 +146,10 @@ | ||
34 | # Intrinsic unix command, with backslash-escaped character interpretation | ||
35 | ECHO = $(UNIXCOMMAND_PATH)echo -e | ||
36 | ZIPEXE = $(UNIXCOMMAND_PATH)zip | ||
37 | - UNZIP = $(UNIXCOMMAND_PATH)unzip | ||
38 | + # UNZIP = $(UNIXCOMMAND_PATH)unzip | ||
39 | else | ||
40 | ZIPEXE = $(UTILS_DEVTOOL_PATH)zip | ||
41 | - UNZIP = $(UTILS_DEVTOOL_PATH)unzip | ||
42 | + # UNZIP = $(UTILS_DEVTOOL_PATH)unzip | ||
43 | endif | ||
44 | # Re-define some utilities | ||
45 | LEX =# override GNU Make intrinsic: no lex on windows | ||
46 | --- openjdk/jdk/make/common/Demo.gmk | ||
47 | +++ openjdk/jdk/make/common/Demo.gmk | ||
48 | @@ -348,7 +348,7 @@ | ||
49 | $(java-vm-cleanup) ) | ||
50 | @( $(CD) $(DEMO_DESTDIR) && $(java-vm-cleanup) ) | ||
51 | @$(ECHO) "Expanding source into demos area at $(DEMO_DESTDIR)" | ||
52 | - ( $(CD) $(DEMO_DESTDIR) && $(UNZIP) -o src.zip && $(RM) src.zip ) | ||
53 | + ( $(CD) $(DEMO_DESTDIR) && $(UNZIP_BIN) -o src.zip && $(RM) src.zip ) | ||
54 | endif | ||
55 | |||
56 | build: sources bundles | ||
57 | --- openjdk/jdk/make/common/Release.gmk | ||
58 | +++ openjdk/jdk/make/common/Release.gmk | ||
59 | @@ -909,7 +909,7 @@ | ||
60 | initial-image-jdk-db: $(DB_ZIP_LIST) | ||
61 | $(MKDIR) -p $(JDK_IMAGE_DIR)/db | ||
62 | for d in $(DB_ZIP_LIST); do \ | ||
63 | - ($(CD) $(JDK_IMAGE_DIR)/db && $(UNZIP) -o $$d); \ | ||
64 | + ($(CD) $(JDK_IMAGE_DIR)/db && $(UNZIP_BIN) -o $$d); \ | ||
65 | done | ||
66 | $(CP) $(ABS_DB_PATH)/README-JDK.html $(JDK_IMAGE_DIR)/db | ||
67 | $(RM) -rf $(DEMODIR)/db | ||
68 | --- openjdk/jdk/make/common/internal/ImportComponents.gmk | ||
69 | +++ openjdk/jdk/make/common/internal/ImportComponents.gmk | ||
70 | @@ -97,8 +97,8 @@ | ||
71 | define Unzipper | ||
72 | ( \ | ||
73 | $(MKDIR) -p $1; \ | ||
74 | - $(ECHO) "( $(CD) $1 && $(UNZIP) -o $2 )"; \ | ||
75 | - ( $(CD) $1 && $(UNZIP) -o $2 ) \ | ||
76 | + $(ECHO) "( $(CD) $1 && $(UNZIP_BIN) -o $2 )"; \ | ||
77 | + ( $(CD) $1 && $(UNZIP_BIN) -o $2 ) \ | ||
78 | ) | ||
79 | endef | ||
80 | |||
81 | --- openjdk/jdk/make/common/shared/Defs-utils.gmk | ||
82 | +++ openjdk/jdk/make/common/shared/Defs-utils.gmk | ||
83 | @@ -145,7 +145,7 @@ | ||
84 | TRUE = $(UTILS_COMMAND_PATH)true | ||
85 | UNAME = $(UTILS_COMMAND_PATH)uname | ||
86 | UNIQ = $(UTILS_USR_BIN_PATH)uniq | ||
87 | -UNZIP = $(UTILS_USR_BIN_PATH)unzip | ||
88 | +# UNZIP = $(UTILS_USR_BIN_PATH)unzip | ||
89 | UNZIPSFX = $(UTILS_DEVTOOL_PATH)unzipsfx | ||
90 | XARGS = $(UTILS_USR_BIN_PATH)xargs | ||
91 | WC = $(UTILS_USR_BIN_PATH)wc | ||
92 | @@ -163,12 +163,12 @@ | ||
93 | # Intrinsic unix command, with backslash-escaped character interpretation | ||
94 | ECHO = $(UNIXCOMMAND_PATH)echo -e | ||
95 | ZIPEXE = $(UNIXCOMMAND_PATH)zip | ||
96 | - UNZIP = $(UNIXCOMMAND_PATH)unzip | ||
97 | + # UNZIP = $(UNIXCOMMAND_PATH)unzip | ||
98 | # Some CYGWIN nawk versions require BINMODE=w for proper '\r' interpretation | ||
99 | NAWK = $(UNIXCOMMAND_PATH)awk -v BINMODE=w | ||
100 | else | ||
101 | ZIPEXE = $(UTILS_DEVTOOL_PATH)zip | ||
102 | - UNZIP = $(UTILS_DEVTOOL_PATH)unzip | ||
103 | + # UNZIP = $(UTILS_DEVTOOL_PATH)unzip | ||
104 | NAWK = $(UNIXCOMMAND_PATH)awk | ||
105 | endif | ||
106 | # Re-define some utilities | ||
107 | --- openjdk/jdk/make/common/shared/Sanity.gmk | ||
108 | +++ openjdk/jdk/make/common/shared/Sanity.gmk | ||
109 | @@ -151,7 +151,7 @@ | ||
110 | # Get the version numbers of what we are using | ||
111 | _MAKE_VER :=$(shell $(MAKE) --version 2>&1 | $(HEAD) -n 1) | ||
112 | _ZIP_VER :=$(shell $(ZIPEXE) -help 2>&1 | $(HEAD) -n 4 | $(EGREP) '^Zip') | ||
113 | -_UNZIP_VER :=$(shell $(UNZIP) -help 2>&1 | $(HEAD) -n 4 | $(EGREP) '^UnZip') | ||
114 | +_UNZIP_VER :=$(shell $(UNZIP_BIN) -help 2>&1 | $(HEAD) -n 4 | $(EGREP) '^UnZip') | ||
115 | _BOOT_VER :=$(shell $(BOOTDIR)/bin/java -version 2>&1 | $(HEAD) -n 1) | ||
116 | MAKE_VER :=$(call GetVersion,"$(_MAKE_VER)") | ||
117 | ZIP_VER :=$(call GetVersion,"$(_ZIP_VER)") | ||
118 | --- openjdk/jdk/make/java/redist/Makefile | ||
119 | +++ openjdk/jdk/make/java/redist/Makefile | ||
120 | @@ -482,8 +482,8 @@ | ||
121 | define SecUnzipper | ||
122 | if [ -f $2 ] ; then \ | ||
123 | $(MKDIR) -p $1; \ | ||
124 | - $(ECHO) "( $(CD) $1 && $(UNZIP) -o $2 )"; \ | ||
125 | - ( $(CD) $1 && $(UNZIP) -o $2 ); \ | ||
126 | + $(ECHO) "( $(CD) $1 && $(UNZIP_BIN) -o $2 )"; \ | ||
127 | + ( $(CD) $1 && $(UNZIP_BIN) -o $2 ); \ | ||
128 | fi | ||
129 | endef | ||
130 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-7/icedtea-makefile-unzip.patch b/recipes-core/openjdk/patches-openjdk-7/icedtea-makefile-unzip.patch new file mode 100644 index 0000000..be29bc0 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-7/icedtea-makefile-unzip.patch | |||
@@ -0,0 +1,176 @@ | |||
1 | Use UNZIP_BIN instead of UNZIP. | ||
2 | |||
3 | Fails with an error message /usr/bin/unzip not found. | ||
4 | Additionally, icedtea7 enables you to specify an unzip to use by setting | ||
5 | the variable UNZIP, this results in an error because unzip uses UNZIP | ||
6 | to specify options, hence you'll end up with unzip trying to unzip unzip. | ||
7 | |||
8 | Upstream-Status: Inappropriate | ||
9 | |||
10 | Signed-off-by: Amy Fong <amy.fong@windriver.com> | ||
11 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | ||
12 | --- | ||
13 | Makefile.am | 14 +++++++------- | ||
14 | Makefile.in | 16 ++++++++-------- | ||
15 | configure.ac | 2 +- | ||
16 | 3 files changed, 16 insertions(+), 16 deletions(-) | ||
17 | |||
18 | diff --git a/Makefile.am b/Makefile.am | ||
19 | index ebb79cd..c109c7a 100644 | ||
20 | --- a/Makefile.am | ||
21 | +++ b/Makefile.am | ||
22 | @@ -1369,7 +1369,7 @@ else | ||
23 | if ! test -d openjdk ; then \ | ||
24 | if [ ! -z $(OPENJDK_SRC_ZIP) ] ; then \ | ||
25 | case "$(OPENJDK_SRC_ZIP)" in \ | ||
26 | - *.zip) $(UNZIP) -q $(OPENJDK_SRC_ZIP) ;; \ | ||
27 | + *.zip) $(UNZIP_BIN) -q $(OPENJDK_SRC_ZIP) ;; \ | ||
28 | *.tar.*) $(TAR) xf $(OPENJDK_SRC_ZIP) ;; \ | ||
29 | esac; \ | ||
30 | mv `echo $(ICEDTEA_PREFIX)|$(SED) 's#\.#-#'`-$(OPENJDK_CHANGESET) openjdk ; \ | ||
31 | @@ -1403,7 +1403,7 @@ else | ||
32 | if ! test -d openjdk/corba ; \ | ||
33 | then \ | ||
34 | case "$(CORBA_SRC_ZIP)" in \ | ||
35 | - *.zip) $(UNZIP) -q $(CORBA_SRC_ZIP) ;; \ | ||
36 | + *.zip) $(UNZIP_BIN) -q $(CORBA_SRC_ZIP) ;; \ | ||
37 | *.tar.*) $(TAR) xf $(CORBA_SRC_ZIP) ;; \ | ||
38 | esac; \ | ||
39 | mv corba-$(CORBA_CHANGESET) openjdk/corba ; \ | ||
40 | @@ -1431,7 +1431,7 @@ else | ||
41 | if ! test -d openjdk/jaxp ; \ | ||
42 | then \ | ||
43 | case "$(JAXP_SRC_ZIP)" in \ | ||
44 | - *.zip) $(UNZIP) -q $(JAXP_SRC_ZIP) ;; \ | ||
45 | + *.zip) $(UNZIP_BIN) -q $(JAXP_SRC_ZIP) ;; \ | ||
46 | *.tar.*) $(TAR) xf $(JAXP_SRC_ZIP) ;; \ | ||
47 | esac; \ | ||
48 | mv jaxp-$(JAXP_CHANGESET) openjdk/jaxp ; \ | ||
49 | @@ -1459,7 +1459,7 @@ else | ||
50 | if ! test -d openjdk/jaxws ; \ | ||
51 | then \ | ||
52 | case "$(JAXWS_SRC_ZIP)" in \ | ||
53 | - *.zip) $(UNZIP) -q $(JAXWS_SRC_ZIP) ;; \ | ||
54 | + *.zip) $(UNZIP_BIN) -q $(JAXWS_SRC_ZIP) ;; \ | ||
55 | *.tar.*) $(TAR) xf $(JAXWS_SRC_ZIP) ;; \ | ||
56 | esac; \ | ||
57 | mv jaxws-$(JAXWS_CHANGESET) openjdk/jaxws ; \ | ||
58 | @@ -1487,7 +1487,7 @@ else | ||
59 | if ! test -d openjdk/jdk ; \ | ||
60 | then \ | ||
61 | case "$(JDK_SRC_ZIP)" in \ | ||
62 | - *.zip) $(UNZIP) -q $(JDK_SRC_ZIP) ;; \ | ||
63 | + *.zip) $(UNZIP_BIN) -q $(JDK_SRC_ZIP) ;; \ | ||
64 | *.tar.*) $(TAR) xf $(JDK_SRC_ZIP) ;; \ | ||
65 | esac; \ | ||
66 | mv jdk-$(JDK_CHANGESET) openjdk/jdk ; \ | ||
67 | @@ -1515,7 +1515,7 @@ else | ||
68 | if ! test -d openjdk/langtools ; \ | ||
69 | then \ | ||
70 | case "$(LANGTOOLS_SRC_ZIP)" in \ | ||
71 | - *.zip) $(UNZIP) -q $(LANGTOOLS_SRC_ZIP) ;; \ | ||
72 | + *.zip) $(UNZIP_BIN) -q $(LANGTOOLS_SRC_ZIP) ;; \ | ||
73 | *.tar.*) $(TAR) xf $(LANGTOOLS_SRC_ZIP) ;; \ | ||
74 | esac; \ | ||
75 | mv langtools-$(LANGTOOLS_CHANGESET) openjdk/langtools ; \ | ||
76 | @@ -1541,7 +1541,7 @@ else | ||
77 | if test -e ${HOTSPOT_SRC_ZIP} ; \ | ||
78 | then \ | ||
79 | case "$(HOTSPOT_SRC_ZIP)" in \ | ||
80 | - *.zip) $(UNZIP) -q $(HOTSPOT_SRC_ZIP) ;; \ | ||
81 | + *.zip) $(UNZIP_BIN) -q $(HOTSPOT_SRC_ZIP) ;; \ | ||
82 | *.tar.*) $(TAR) xf $(HOTSPOT_SRC_ZIP) ;; \ | ||
83 | esac; \ | ||
84 | if test "x${HSBUILD}" != "xdefault"; then \ | ||
85 | diff --git a/Makefile.in b/Makefile.in | ||
86 | index f890991..fd09bda 100644 | ||
87 | --- a/Makefile.in | ||
88 | +++ b/Makefile.in | ||
89 | @@ -495,7 +495,7 @@ SYSTEM_JDK_DIR = @SYSTEM_JDK_DIR@ | ||
90 | TAR = @TAR@ | ||
91 | TOOLS_JAR = @TOOLS_JAR@ | ||
92 | TZDATA_DIR = @TZDATA_DIR@ | ||
93 | -UNZIP = @UNZIP@ | ||
94 | +UNZIP_BIN = @UNZIP@ | ||
95 | USING_CACAO = @USING_CACAO@ | ||
96 | USING_ECJ = @USING_ECJ@ | ||
97 | VERSION = @VERSION@ | ||
98 | @@ -1845,7 +1845,7 @@ stamps/extract-openjdk.stamp: stamps/download-openjdk.stamp | ||
99 | @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ if ! test -d openjdk ; then \ | ||
100 | @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ if [ ! -z $(OPENJDK_SRC_ZIP) ] ; then \ | ||
101 | @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ case "$(OPENJDK_SRC_ZIP)" in \ | ||
102 | -@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ *.zip) $(UNZIP) -q $(OPENJDK_SRC_ZIP) ;; \ | ||
103 | +@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ *.zip) $(UNZIP_BIN) -q $(OPENJDK_SRC_ZIP) ;; \ | ||
104 | @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ *.tar.*) $(TAR) xf $(OPENJDK_SRC_ZIP) ;; \ | ||
105 | @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ esac; \ | ||
106 | @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ mv `echo $(ICEDTEA_PREFIX)|$(SED) 's#\.#-#'`-$(OPENJDK_CHANGESET) openjdk ; \ | ||
107 | @@ -1873,7 +1873,7 @@ stamps/extract-corba.stamp: stamps/extract-openjdk.stamp stamps/download-corba.s | ||
108 | @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ if ! test -d openjdk/corba ; \ | ||
109 | @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ then \ | ||
110 | @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ case "$(CORBA_SRC_ZIP)" in \ | ||
111 | -@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ *.zip) $(UNZIP) -q $(CORBA_SRC_ZIP) ;; \ | ||
112 | +@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ *.zip) $(UNZIP_BIN) -q $(CORBA_SRC_ZIP) ;; \ | ||
113 | @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ *.tar.*) $(TAR) xf $(CORBA_SRC_ZIP) ;; \ | ||
114 | @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ esac; \ | ||
115 | @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ mv corba-$(CORBA_CHANGESET) openjdk/corba ; \ | ||
116 | @@ -1895,7 +1895,7 @@ stamps/extract-jaxp.stamp: stamps/extract-openjdk.stamp stamps/download-jaxp.sta | ||
117 | @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ if ! test -d openjdk/jaxp ; \ | ||
118 | @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ then \ | ||
119 | @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ case "$(JAXP_SRC_ZIP)" in \ | ||
120 | -@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ *.zip) $(UNZIP) -q $(JAXP_SRC_ZIP) ;; \ | ||
121 | +@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ *.zip) $(UNZIP_BIN) -q $(JAXP_SRC_ZIP) ;; \ | ||
122 | @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ *.tar.*) $(TAR) xf $(JAXP_SRC_ZIP) ;; \ | ||
123 | @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ esac; \ | ||
124 | @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ mv jaxp-$(JAXP_CHANGESET) openjdk/jaxp ; \ | ||
125 | @@ -1917,7 +1917,7 @@ stamps/extract-jaxws.stamp: stamps/extract-openjdk.stamp stamps/download-jaxws.s | ||
126 | @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ if ! test -d openjdk/jaxws ; \ | ||
127 | @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ then \ | ||
128 | @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ case "$(JAXWS_SRC_ZIP)" in \ | ||
129 | -@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ *.zip) $(UNZIP) -q $(JAXWS_SRC_ZIP) ;; \ | ||
130 | +@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ *.zip) $(UNZIP_BIN) -q $(JAXWS_SRC_ZIP) ;; \ | ||
131 | @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ *.tar.*) $(TAR) xf $(JAXWS_SRC_ZIP) ;; \ | ||
132 | @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ esac; \ | ||
133 | @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ mv jaxws-$(JAXWS_CHANGESET) openjdk/jaxws ; \ | ||
134 | @@ -1939,7 +1939,7 @@ stamps/extract-jdk.stamp: stamps/extract-openjdk.stamp stamps/download-jdk.stamp | ||
135 | @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ if ! test -d openjdk/jdk ; \ | ||
136 | @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ then \ | ||
137 | @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ case "$(JDK_SRC_ZIP)" in \ | ||
138 | -@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ *.zip) $(UNZIP) -q $(JDK_SRC_ZIP) ;; \ | ||
139 | +@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ *.zip) $(UNZIP_BIN) -q $(JDK_SRC_ZIP) ;; \ | ||
140 | @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ *.tar.*) $(TAR) xf $(JDK_SRC_ZIP) ;; \ | ||
141 | @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ esac; \ | ||
142 | @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ mv jdk-$(JDK_CHANGESET) openjdk/jdk ; \ | ||
143 | @@ -1961,7 +1961,7 @@ stamps/extract-langtools.stamp: stamps/extract-openjdk.stamp stamps/download-lan | ||
144 | @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ if ! test -d openjdk/langtools ; \ | ||
145 | @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ then \ | ||
146 | @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ case "$(LANGTOOLS_SRC_ZIP)" in \ | ||
147 | -@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ *.zip) $(UNZIP) -q $(LANGTOOLS_SRC_ZIP) ;; \ | ||
148 | +@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ *.zip) $(UNZIP_BIN) -q $(LANGTOOLS_SRC_ZIP) ;; \ | ||
149 | @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ *.tar.*) $(TAR) xf $(LANGTOOLS_SRC_ZIP) ;; \ | ||
150 | @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ esac; \ | ||
151 | @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ mv langtools-$(LANGTOOLS_CHANGESET) openjdk/langtools ; \ | ||
152 | @@ -1981,7 +1981,7 @@ stamps/extract-hotspot.stamp: stamps/extract-openjdk.stamp stamps/download-hotsp | ||
153 | @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ if test -e ${HOTSPOT_SRC_ZIP} ; \ | ||
154 | @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ then \ | ||
155 | @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ case "$(HOTSPOT_SRC_ZIP)" in \ | ||
156 | -@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ *.zip) $(UNZIP) -q $(HOTSPOT_SRC_ZIP) ;; \ | ||
157 | +@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ *.zip) $(UNZIP_BIN) -q $(HOTSPOT_SRC_ZIP) ;; \ | ||
158 | @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ *.tar.*) $(TAR) xf $(HOTSPOT_SRC_ZIP) ;; \ | ||
159 | @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ esac; \ | ||
160 | @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ if test "x${HSBUILD}" != "xdefault"; then \ | ||
161 | diff --git a/configure.ac b/configure.ac | ||
162 | index 5291130..8fbccad 100644 | ||
163 | --- a/configure.ac | ||
164 | +++ b/configure.ac | ||
165 | @@ -34,7 +34,7 @@ IT_FIND_TOOL([CHMOD], [chmod]) | ||
166 | IT_FIND_TOOLS([SHA256SUM], [gsha256sum sha256sum]) | ||
167 | IT_FIND_TOOL([WGET], [wget]) | ||
168 | IT_FIND_TOOL([ZIP], [zip]) | ||
169 | -IT_FIND_TOOL([UNZIP], [unzip]) | ||
170 | +IT_FIND_TOOL([UNZIP_BIN], [unzip]) | ||
171 | IT_FIND_TOOL([CPIO], [cpio]) | ||
172 | IT_FIND_TOOL([FILE], [file]) | ||
173 | IT_FIND_TOOL([READLINK], [readlink]) | ||
174 | -- | ||
175 | 2.3.5 | ||
176 | |||