summaryrefslogtreecommitdiffstats
path: root/recipes-core/icedtea/openjdk-7-release-03b147.inc
diff options
context:
space:
mode:
authorAmy Fong <amy.fong@windriver.com>2015-04-16 18:24:53 -0400
committerOtavio Salvador <otavio@ossystems.com.br>2016-01-04 09:21:07 -0200
commit6273537d06b9df611a2f41b3de6e552941e1cf94 (patch)
tree08d55e19f7f0b75a96a941709135b0fabf41672f /recipes-core/icedtea/openjdk-7-release-03b147.inc
parent23ae934ae40898e1910d3e126a7796b9b2feec36 (diff)
downloadmeta-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/icedtea/openjdk-7-release-03b147.inc')
-rw-r--r--recipes-core/icedtea/openjdk-7-release-03b147.inc3
1 files changed, 3 insertions, 0 deletions
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
76OPENJDK_PATCHES = " \ 77OPENJDK_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
92OPENJDK_HEADLESS_PATCHES = " \ 94OPENJDK_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 "