diff options
| author |   tolkien-joh <yong-il.joh@windriver.com> | 2016-09-23 10:14:25 +0900 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2016-09-23 10:14:25 +0900 |
| commit | 482b222ea4306632df3c3e65a98c3cbff248d0db (patch) | |
| tree | c53614115132a2aaa875cd35670728d5866e91cd | |
| parent | a8e5770edd2fb8e949129ec5f72b58c826a990c9 (diff) | |
| parent | 7033a0378dd7438835d2fe317142cf1332958168 (diff) | |
| download | meta-ivi-482b222ea4306632df3c3e65a98c3cbff248d0db.tar.gz meta-ivi-482b222ea4306632df3c3e65a98c3cbff248d0db.tar.bz2 meta-ivi-482b222ea4306632df3c3e65a98c3cbff248d0db.zip | |
Merge pull request #20 from RobertAJMarshall/capi-java-fix
Fix build issue with java versions other than 1.8
| -rw-r--r-- | meta-ivi/recipes-extended/common-api/capicxx-native.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-ivi/recipes-extended/common-api/capicxx-native.inc b/meta-ivi/recipes-extended/common-api/capicxx-native.inc index f3300bd..58beda1 100644 --- a/meta-ivi/recipes-extended/common-api/capicxx-native.inc +++ b/meta-ivi/recipes-extended/common-api/capicxx-native.inc @@ -26,7 +26,7 @@ DD = "${D}${datadir}/${PN}-${PV}" do_install() { # work around for java-8 - java_version=`java -version 2>&1 | head -n 1 | grep '[ "]1\.8[\. "$$]'` + java_version=`java -version 2>&1 | head -n 1 | grep { '[ "]1\.8[\. "$$]' || true; }` 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 |