diff options
author | 2016-08-22 19:59:50 +0900 | |
---|---|---|
committer | 2016-08-24 15:27:09 +0900 | |
commit | 6be09281ac614cfdc92cf08fd584914d97818c1c (patch) | |
tree | 85c30130be1364bcdf7e0969e9978e4fdf14441c | |
parent | e37d91189e32a28e52c7038dd7b6aa23384afe70 (diff) | |
download | meta-ivi-6be09281ac614cfdc92cf08fd584914d97818c1c.tar.gz meta-ivi-6be09281ac614cfdc92cf08fd584914d97818c1c.tar.bz2 meta-ivi-6be09281ac614cfdc92cf08fd584914d97818c1c.zip |
capicxx-*-native: fix build error when java-8 is used
Signed-off-by: Yong-iL Joh <yong-il.joh@windriver.com>
-rw-r--r-- | meta-ivi/recipes-extended/common-api/capicxx-native.inc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/meta-ivi/recipes-extended/common-api/capicxx-native.inc b/meta-ivi/recipes-extended/common-api/capicxx-native.inc index 19b22e3..f3300bd 100644 --- a/meta-ivi/recipes-extended/common-api/capicxx-native.inc +++ b/meta-ivi/recipes-extended/common-api/capicxx-native.inc @@ -25,6 +25,14 @@ S = "${WORKDIR}" DD = "${D}${datadir}/${PN}-${PV}" do_install() { + # work around for java-8 + java_version=`java -version 2>&1 | head -n 1 | grep '[ "]1\.8[\. "$$]'` + if [ "x${java_version}" != "x" ]; then + for i in x86 x86_64; do + perl -pi -e 's|-XX:PermSize=128m||' ${S}/${LAUNCHER_BASE}-linux-${i}.ini + done + fi + install -d ${DD} install -m 0644 ${S}/artifacts.xml ${DD} install -m 0755 ${S}/${LAUNCHER_BASE}-linux-x86 ${DD} |