summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/openjdk-7-common.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/openjdk/openjdk-7-common.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/openjdk/openjdk-7-common.inc')
-rw-r--r--recipes-core/openjdk/openjdk-7-common.inc2
1 files changed, 2 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.