diff options
Diffstat (limited to 'recipes-core/icedtea')
4 files changed, 302 insertions, 0 deletions
diff --git a/recipes-core/icedtea/icedtea7-native.inc b/recipes-core/icedtea/icedtea7-native.inc index b38f3cb..cb6b5d3 100644 --- a/recipes-core/icedtea/icedtea7-native.inc +++ b/recipes-core/icedtea/icedtea7-native.inc | |||
@@ -85,6 +85,7 @@ EXTRA_OECONF = "\ | |||
85 | --with-jaxws-src-zip=${DL_DIR}/${JAXWS_FILE} \ | 85 | --with-jaxws-src-zip=${DL_DIR}/${JAXWS_FILE} \ |
86 | --with-jdk-src-zip=${DL_DIR}/${JDK_FILE} \ | 86 | --with-jdk-src-zip=${DL_DIR}/${JDK_FILE} \ |
87 | --with-langtools-src-zip=${DL_DIR}/${LANGTOOLS_FILE} \ | 87 | --with-langtools-src-zip=${DL_DIR}/${LANGTOOLS_FILE} \ |
88 | ac_cv_path_UNZIP_BIN="${STAGING_BINDIR_NATIVE}/unzip" \ | ||
88 | " | 89 | " |
89 | 90 | ||
90 | JDK_DIR = "icedtea7-native" | 91 | JDK_DIR = "icedtea7-native" |
@@ -163,6 +164,7 @@ EXTRA_OEMAKE = ' \ | |||
163 | ZIPEXE="${STAGING_BINDIR_NATIVE}/zip" \ | 164 | ZIPEXE="${STAGING_BINDIR_NATIVE}/zip" \ |
164 | ${OEMAKE_BUILD_HEADLESS_ONLY} \ | 165 | ${OEMAKE_BUILD_HEADLESS_ONLY} \ |
165 | DISABLE_HOTSPOT_OS_VERSION_CHECK=ok \ | 166 | DISABLE_HOTSPOT_OS_VERSION_CHECK=ok \ |
167 | UNZIP_BIN="${STAGING_BINDIR_NATIVE}/unzip" \ | ||
166 | ' | 168 | ' |
167 | 169 | ||
168 | do_compile() { | 170 | do_compile() { |
diff --git a/recipes-core/icedtea/openjdk-7-03b147/icedtea-jdk-unzip.patch b/recipes-core/icedtea/openjdk-7-03b147/icedtea-jdk-unzip.patch new file mode 100644 index 0000000..8c29730 --- /dev/null +++ b/recipes-core/icedtea/openjdk-7-03b147/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/icedtea/openjdk-7-03b147/icedtea-makefile-unzip.patch b/recipes-core/icedtea/openjdk-7-03b147/icedtea-makefile-unzip.patch new file mode 100644 index 0000000..9b69a42 --- /dev/null +++ b/recipes-core/icedtea/openjdk-7-03b147/icedtea-makefile-unzip.patch | |||
@@ -0,0 +1,167 @@ | |||
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 | --- a/Makefile.am | ||
19 | +++ b/Makefile.am | ||
20 | @@ -1056,7 +1056,7 @@ | ||
21 | if ! test -d openjdk ; then \ | ||
22 | if [ ! -z $(OPENJDK_SRC_ZIP) ] ; then \ | ||
23 | case "$(OPENJDK_SRC_ZIP)" in \ | ||
24 | - *.zip) $(UNZIP) -q $(OPENJDK_SRC_ZIP) ;; \ | ||
25 | + *.zip) $(UNZIP_BIN) -q $(OPENJDK_SRC_ZIP) ;; \ | ||
26 | *.tar.*) $(TAR) xf $(OPENJDK_SRC_ZIP) ;; \ | ||
27 | esac; \ | ||
28 | mv `echo $(ICEDTEA_PREFIX)|sed 's#\.#-#'`-$(OPENJDK_CHANGESET) openjdk ; \ | ||
29 | @@ -1072,7 +1072,7 @@ | ||
30 | if ! test -d openjdk/corba ; \ | ||
31 | then \ | ||
32 | case "$(CORBA_SRC_ZIP)" in \ | ||
33 | - *.zip) $(UNZIP) -q $(CORBA_SRC_ZIP) ;; \ | ||
34 | + *.zip) $(UNZIP_BIN) -q $(CORBA_SRC_ZIP) ;; \ | ||
35 | *.tar.*) $(TAR) xf $(CORBA_SRC_ZIP) ;; \ | ||
36 | esac; \ | ||
37 | mv corba-$(CORBA_CHANGESET) openjdk/corba ; \ | ||
38 | @@ -1086,7 +1086,7 @@ | ||
39 | if ! test -d openjdk/jaxp ; \ | ||
40 | then \ | ||
41 | case "$(JAXP_SRC_ZIP)" in \ | ||
42 | - *.zip) $(UNZIP) -q $(JAXP_SRC_ZIP) ;; \ | ||
43 | + *.zip) $(UNZIP_BIN) -q $(JAXP_SRC_ZIP) ;; \ | ||
44 | *.tar.*) $(TAR) xf $(JAXP_SRC_ZIP) ;; \ | ||
45 | esac; \ | ||
46 | mv jaxp-$(JAXP_CHANGESET) openjdk/jaxp ; \ | ||
47 | @@ -1100,7 +1100,7 @@ | ||
48 | if ! test -d openjdk/jaxws ; \ | ||
49 | then \ | ||
50 | case "$(JAXWS_SRC_ZIP)" in \ | ||
51 | - *.zip) $(UNZIP) -q $(JAXWS_SRC_ZIP) ;; \ | ||
52 | + *.zip) $(UNZIP_BIN) -q $(JAXWS_SRC_ZIP) ;; \ | ||
53 | *.tar.*) $(TAR) xf $(JAXWS_SRC_ZIP) ;; \ | ||
54 | esac; \ | ||
55 | mv jaxws-$(JAXWS_CHANGESET) openjdk/jaxws ; \ | ||
56 | @@ -1114,7 +1114,7 @@ | ||
57 | if ! test -d openjdk/jdk ; \ | ||
58 | then \ | ||
59 | case "$(JDK_SRC_ZIP)" in \ | ||
60 | - *.zip) $(UNZIP) -q $(JDK_SRC_ZIP) ;; \ | ||
61 | + *.zip) $(UNZIP_BIN) -q $(JDK_SRC_ZIP) ;; \ | ||
62 | *.tar.*) $(TAR) xf $(JDK_SRC_ZIP) ;; \ | ||
63 | esac; \ | ||
64 | mv jdk-$(JDK_CHANGESET) openjdk/jdk ; \ | ||
65 | @@ -1128,7 +1128,7 @@ | ||
66 | if ! test -d openjdk/langtools ; \ | ||
67 | then \ | ||
68 | case "$(LANGTOOLS_SRC_ZIP)" in \ | ||
69 | - *.zip) $(UNZIP) -q $(LANGTOOLS_SRC_ZIP) ;; \ | ||
70 | + *.zip) $(UNZIP_BIN) -q $(LANGTOOLS_SRC_ZIP) ;; \ | ||
71 | *.tar.*) $(TAR) xf $(LANGTOOLS_SRC_ZIP) ;; \ | ||
72 | esac; \ | ||
73 | mv langtools-$(LANGTOOLS_CHANGESET) openjdk/langtools ; \ | ||
74 | @@ -1150,7 +1150,7 @@ | ||
75 | if test -e ${HOTSPOT_SRC_ZIP} ; \ | ||
76 | then \ | ||
77 | case "$(HOTSPOT_SRC_ZIP)" in \ | ||
78 | - *.zip) $(UNZIP) -q $(HOTSPOT_SRC_ZIP) ;; \ | ||
79 | + *.zip) $(UNZIP_BIN) -q $(HOTSPOT_SRC_ZIP) ;; \ | ||
80 | *.tar.*) $(TAR) xf $(HOTSPOT_SRC_ZIP) ;; \ | ||
81 | esac; \ | ||
82 | if test "x${HSBUILD}" != "xdefault"; then \ | ||
83 | --- a/Makefile.in | ||
84 | +++ b/Makefile.in | ||
85 | @@ -404,7 +404,7 @@ | ||
86 | SYSTEM_JDK_DIR = @SYSTEM_JDK_DIR@ | ||
87 | TAR = @TAR@ | ||
88 | TZDATA_DIR = @TZDATA_DIR@ | ||
89 | -UNZIP = @UNZIP@ | ||
90 | +UNZIP_BIN = @UNZIP_BIN@ | ||
91 | USING_ECJ = @USING_ECJ@ | ||
92 | VERSION = @VERSION@ | ||
93 | VERSION_SUFFIX = @VERSION_SUFFIX@ | ||
94 | @@ -1581,7 +1581,7 @@ | ||
95 | @OPENJDK_SRC_DIR_FOUND_FALSE@ if ! test -d openjdk ; then \ | ||
96 | @OPENJDK_SRC_DIR_FOUND_FALSE@ if [ ! -z $(OPENJDK_SRC_ZIP) ] ; then \ | ||
97 | @OPENJDK_SRC_DIR_FOUND_FALSE@ case "$(OPENJDK_SRC_ZIP)" in \ | ||
98 | -@OPENJDK_SRC_DIR_FOUND_FALSE@ *.zip) $(UNZIP) -q $(OPENJDK_SRC_ZIP) ;; \ | ||
99 | +@OPENJDK_SRC_DIR_FOUND_FALSE@ *.zip) $(UNZIP_BIN) -q $(OPENJDK_SRC_ZIP) ;; \ | ||
100 | @OPENJDK_SRC_DIR_FOUND_FALSE@ *.tar.*) $(TAR) xf $(OPENJDK_SRC_ZIP) ;; \ | ||
101 | @OPENJDK_SRC_DIR_FOUND_FALSE@ esac; \ | ||
102 | @OPENJDK_SRC_DIR_FOUND_FALSE@ mv `echo $(ICEDTEA_PREFIX)|sed 's#\.#-#'`-$(OPENJDK_CHANGESET) openjdk ; \ | ||
103 | @@ -1597,7 +1597,7 @@ | ||
104 | @OPENJDK_SRC_DIR_FOUND_FALSE@ if ! test -d openjdk/corba ; \ | ||
105 | @OPENJDK_SRC_DIR_FOUND_FALSE@ then \ | ||
106 | @OPENJDK_SRC_DIR_FOUND_FALSE@ case "$(CORBA_SRC_ZIP)" in \ | ||
107 | -@OPENJDK_SRC_DIR_FOUND_FALSE@ *.zip) $(UNZIP) -q $(CORBA_SRC_ZIP) ;; \ | ||
108 | +@OPENJDK_SRC_DIR_FOUND_FALSE@ *.zip) $(UNZIP_BIN) -q $(CORBA_SRC_ZIP) ;; \ | ||
109 | @OPENJDK_SRC_DIR_FOUND_FALSE@ *.tar.*) $(TAR) xf $(CORBA_SRC_ZIP) ;; \ | ||
110 | @OPENJDK_SRC_DIR_FOUND_FALSE@ esac; \ | ||
111 | @OPENJDK_SRC_DIR_FOUND_FALSE@ mv corba-$(CORBA_CHANGESET) openjdk/corba ; \ | ||
112 | @@ -1611,7 +1611,7 @@ | ||
113 | @OPENJDK_SRC_DIR_FOUND_FALSE@ if ! test -d openjdk/jaxp ; \ | ||
114 | @OPENJDK_SRC_DIR_FOUND_FALSE@ then \ | ||
115 | @OPENJDK_SRC_DIR_FOUND_FALSE@ case "$(JAXP_SRC_ZIP)" in \ | ||
116 | -@OPENJDK_SRC_DIR_FOUND_FALSE@ *.zip) $(UNZIP) -q $(JAXP_SRC_ZIP) ;; \ | ||
117 | +@OPENJDK_SRC_DIR_FOUND_FALSE@ *.zip) $(UNZIP_BIN) -q $(JAXP_SRC_ZIP) ;; \ | ||
118 | @OPENJDK_SRC_DIR_FOUND_FALSE@ *.tar.*) $(TAR) xf $(JAXP_SRC_ZIP) ;; \ | ||
119 | @OPENJDK_SRC_DIR_FOUND_FALSE@ esac; \ | ||
120 | @OPENJDK_SRC_DIR_FOUND_FALSE@ mv jaxp-$(JAXP_CHANGESET) openjdk/jaxp ; \ | ||
121 | @@ -1625,7 +1625,7 @@ | ||
122 | @OPENJDK_SRC_DIR_FOUND_FALSE@ if ! test -d openjdk/jaxws ; \ | ||
123 | @OPENJDK_SRC_DIR_FOUND_FALSE@ then \ | ||
124 | @OPENJDK_SRC_DIR_FOUND_FALSE@ case "$(JAXWS_SRC_ZIP)" in \ | ||
125 | -@OPENJDK_SRC_DIR_FOUND_FALSE@ *.zip) $(UNZIP) -q $(JAXWS_SRC_ZIP) ;; \ | ||
126 | +@OPENJDK_SRC_DIR_FOUND_FALSE@ *.zip) $(UNZIP_BIN) -q $(JAXWS_SRC_ZIP) ;; \ | ||
127 | @OPENJDK_SRC_DIR_FOUND_FALSE@ *.tar.*) $(TAR) xf $(JAXWS_SRC_ZIP) ;; \ | ||
128 | @OPENJDK_SRC_DIR_FOUND_FALSE@ esac; \ | ||
129 | @OPENJDK_SRC_DIR_FOUND_FALSE@ mv jaxws-$(JAXWS_CHANGESET) openjdk/jaxws ; \ | ||
130 | @@ -1639,7 +1639,7 @@ | ||
131 | @OPENJDK_SRC_DIR_FOUND_FALSE@ if ! test -d openjdk/jdk ; \ | ||
132 | @OPENJDK_SRC_DIR_FOUND_FALSE@ then \ | ||
133 | @OPENJDK_SRC_DIR_FOUND_FALSE@ case "$(JDK_SRC_ZIP)" in \ | ||
134 | -@OPENJDK_SRC_DIR_FOUND_FALSE@ *.zip) $(UNZIP) -q $(JDK_SRC_ZIP) ;; \ | ||
135 | +@OPENJDK_SRC_DIR_FOUND_FALSE@ *.zip) $(UNZIP_BIN) -q $(JDK_SRC_ZIP) ;; \ | ||
136 | @OPENJDK_SRC_DIR_FOUND_FALSE@ *.tar.*) $(TAR) xf $(JDK_SRC_ZIP) ;; \ | ||
137 | @OPENJDK_SRC_DIR_FOUND_FALSE@ esac; \ | ||
138 | @OPENJDK_SRC_DIR_FOUND_FALSE@ mv jdk-$(JDK_CHANGESET) openjdk/jdk ; \ | ||
139 | @@ -1653,7 +1653,7 @@ | ||
140 | @OPENJDK_SRC_DIR_FOUND_FALSE@ if ! test -d openjdk/langtools ; \ | ||
141 | @OPENJDK_SRC_DIR_FOUND_FALSE@ then \ | ||
142 | @OPENJDK_SRC_DIR_FOUND_FALSE@ case "$(LANGTOOLS_SRC_ZIP)" in \ | ||
143 | -@OPENJDK_SRC_DIR_FOUND_FALSE@ *.zip) $(UNZIP) -q $(LANGTOOLS_SRC_ZIP) ;; \ | ||
144 | +@OPENJDK_SRC_DIR_FOUND_FALSE@ *.zip) $(UNZIP_BIN) -q $(LANGTOOLS_SRC_ZIP) ;; \ | ||
145 | @OPENJDK_SRC_DIR_FOUND_FALSE@ *.tar.*) $(TAR) xf $(LANGTOOLS_SRC_ZIP) ;; \ | ||
146 | @OPENJDK_SRC_DIR_FOUND_FALSE@ esac; \ | ||
147 | @OPENJDK_SRC_DIR_FOUND_FALSE@ mv langtools-$(LANGTOOLS_CHANGESET) openjdk/langtools ; \ | ||
148 | @@ -1674,7 +1674,7 @@ | ||
149 | if test -e ${HOTSPOT_SRC_ZIP} ; \ | ||
150 | then \ | ||
151 | case "$(HOTSPOT_SRC_ZIP)" in \ | ||
152 | - *.zip) $(UNZIP) -q $(HOTSPOT_SRC_ZIP) ;; \ | ||
153 | + *.zip) $(UNZIP_BIN) -q $(HOTSPOT_SRC_ZIP) ;; \ | ||
154 | *.tar.*) $(TAR) xf $(HOTSPOT_SRC_ZIP) ;; \ | ||
155 | esac; \ | ||
156 | if test "x${HSBUILD}" != "xdefault"; then \ | ||
157 | --- a/configure.ac | ||
158 | +++ b/configure.ac | ||
159 | @@ -28,7 +28,7 @@ | ||
160 | IT_FIND_TOOL([SHA256SUM], [sha256sum]) | ||
161 | IT_FIND_TOOL([WGET], [wget]) | ||
162 | IT_FIND_TOOL([ZIP], [zip]) | ||
163 | -IT_FIND_TOOL([UNZIP], [unzip]) | ||
164 | +IT_FIND_TOOL([UNZIP_BIN], [unzip]) | ||
165 | IT_FIND_TOOL([CPIO], [cpio]) | ||
166 | IT_FIND_TOOL([FILE], [file]) | ||
167 | AC_CHECK_TOOLS([FASTJAR], [fastjar jar]) | ||
diff --git a/recipes-core/icedtea/openjdk-7-release-03b147.inc b/recipes-core/icedtea/openjdk-7-release-03b147.inc index 83b087c..fdf3a89 100644 --- a/recipes-core/icedtea/openjdk-7-release-03b147.inc +++ b/recipes-core/icedtea/openjdk-7-release-03b147.inc | |||
@@ -71,6 +71,7 @@ ICEDTEA_PATCHES = " \ | |||
71 | file://build-hacks-native.patch \ | 71 | file://build-hacks-native.patch \ |
72 | file://icedtea-sane-x86-arch-name.patch \ | 72 | file://icedtea-sane-x86-arch-name.patch \ |
73 | file://fix-checksums.patch \ | 73 | file://fix-checksums.patch \ |
74 | file://icedtea-makefile-unzip.patch \ | ||
74 | " | 75 | " |
75 | 76 | ||
76 | OPENJDK_PATCHES = " \ | 77 | OPENJDK_PATCHES = " \ |
@@ -87,6 +88,7 @@ OPENJDK_PATCHES = " \ | |||
87 | file://icedtea-hotspot-fix-undefined-behaviour.patch;apply=no \ | 88 | file://icedtea-hotspot-fix-undefined-behaviour.patch;apply=no \ |
88 | file://icedtea-x11_extension_cleanup.patch;apply=no \ | 89 | file://icedtea-x11_extension_cleanup.patch;apply=no \ |
89 | file://icedtea-CVE-2014-1876-unpack.patch;apply=no \ | 90 | file://icedtea-CVE-2014-1876-unpack.patch;apply=no \ |
91 | file://icedtea-jdk-unzip.patch;apply=no \ | ||
90 | " | 92 | " |
91 | 93 | ||
92 | OPENJDK_HEADLESS_PATCHES = " \ | 94 | OPENJDK_HEADLESS_PATCHES = " \ |
@@ -108,5 +110,6 @@ export DISTRIBUTION_PATCHES = " \ | |||
108 | patches/icedtea-hotspot-fix-undefined-behaviour.patch \ | 110 | patches/icedtea-hotspot-fix-undefined-behaviour.patch \ |
109 | patches/icedtea-x11_extension_cleanup.patch \ | 111 | patches/icedtea-x11_extension_cleanup.patch \ |
110 | patches/icedtea-CVE-2014-1876-unpack.patch \ | 112 | patches/icedtea-CVE-2014-1876-unpack.patch \ |
113 | patches/icedtea-jdk-unzip.patch \ | ||
111 | ${CLEAN_X11_DISTRIBUTION_PATCH} \ | 114 | ${CLEAN_X11_DISTRIBUTION_PATCH} \ |
112 | " | 115 | " |