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