[oe] [meta-java][PATCH] openjdk-8-cross.inc: Fix QA error caused by missing hash

Erkka Kääriä erkka.kaaria at intel.com
Fri Aug 19 13:24:36 UTC 2016


Some openjdk makefiles (e.g. vm.make) only use CFLAGS as their linker
flags. This means that the oe-specific linker flags are lost. This in
particular causes issues with the recent oe-core commit a98a81808, which
intentionally poisons the linker hash style, so that any recipes that do
not use the oe LDFLAGS fail to build.

Signed-off-by: Erkka Kääriä <erkka.kaaria at intel.com>
---
 recipes-core/openjdk/openjdk-8-cross.inc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/recipes-core/openjdk/openjdk-8-cross.inc b/recipes-core/openjdk/openjdk-8-cross.inc
index 11e94ce..6097afc 100644
--- a/recipes-core/openjdk/openjdk-8-cross.inc
+++ b/recipes-core/openjdk/openjdk-8-cross.inc
@@ -39,21 +39,23 @@ SRC_URI_append = "\
     file://jvm.cfg \
 "
 
+# Some makefiles pick the linker flags from the CFLAGS variable, so add
+# the LDFLAGS to CFLAGS
+CFLAGS_append = " \
+  ${LDFLAGS} \
+"
+
 EXTRA_OECONF_append = "\
     --with-jobs=${@get_jdk8_native_jobs(d)} \
-    \
     --with-sys-root=${STAGING_DIR} \
     --with-tools-dir=${STAGING_DIR_NATIVE} \
     --with-boot-jdk=${STAGING_LIBDIR_NATIVE}/jvm/openjdk-8-native \
     --with-cacerts-file=${STAGING_LIBDIR_NATIVE}/jvm/openjdk-8-native/jre/lib/security/cacerts \
-    \
     --disable-precompiled-headers \
     --disable-zip-debug-info \
-    \
     --with-extra-cflags='${CFLAGS}' \
     --with-extra-cxxflags='${CXXFLAGS}' \
     --with-extra-ldflags='${LDFLAGS}' \
-    \
     ${@jdk_configure_options(d)} \
 "
 
-- 
2.7.4

---------------------------------------------------------------------
Intel Finland Oy
Registered Address: PL 281, 00181 Helsinki 
Business Identity Code: 0357606 - 4 
Domiciled in Helsinki 

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.


More information about the Openembedded-devel mailing list