diff options
Diffstat (limited to 'recipes-core/icedtea/openjdk-7-03b147/icedtea-makefile-unzip.patch')
-rw-r--r-- | recipes-core/icedtea/openjdk-7-03b147/icedtea-makefile-unzip.patch | 167 |
1 files changed, 167 insertions, 0 deletions
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]) | ||