diff options
author | Amy Fong <amy.fong@windriver.com> | 2015-04-16 18:24:53 -0400 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2016-01-04 09:21:07 -0200 |
commit | 6273537d06b9df611a2f41b3de6e552941e1cf94 (patch) | |
tree | 08d55e19f7f0b75a96a941709135b0fabf41672f /recipes-core/icedtea/icedtea7-native.inc | |
parent | 23ae934ae40898e1910d3e126a7796b9b2feec36 (diff) | |
download | meta-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/icedtea7-native.inc')
-rw-r--r-- | recipes-core/icedtea/icedtea7-native.inc | 2 |
1 files changed, 2 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() { |