[oe-commits] Khem Raj : luajit, acpitests: Fix build on hardfloat arm
git at git.openembedded.org
git at git.openembedded.org
Fri Sep 26 03:42:55 UTC 2014
Module: meta-openembedded.git
Branch: master-next
Commit: add0ba41de8930d726067b95a0d1dfa1b37e21c5
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=add0ba41de8930d726067b95a0d1dfa1b37e21c5
Author: Khem Raj <raj.khem at gmail.com>
Date: Thu Sep 4 00:32:35 2014 -0700
luajit, acpitests: Fix build on hardfloat arm
luajit as well as acpitests build system has mind of its own and does not
respect CC and friends in makefiles so we have to inject
the CFLAGS via EXTRA_OEMAKE, some of ABI defining params
e.g. float-abi selection is mentioned in TUNE_CCARGS and
not in TOOLCHAIN_OPTIONS. This causes build to go for softfloat
build and that is not what we want.
Signed-off-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
meta-oe/recipes-devtools/luajit/luajit_2.0.3.bb | 5 ++++-
meta-oe/recipes-extended/acpica/acpitests_20140424.bb | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.0.3.bb b/meta-oe/recipes-devtools/luajit/luajit_2.0.3.bb
index 684ec14..48137e3 100644
--- a/meta-oe/recipes-devtools/luajit/luajit_2.0.3.bb
+++ b/meta-oe/recipes-devtools/luajit/luajit_2.0.3.bb
@@ -20,7 +20,10 @@ do_configure_prepend() {
sed -i -e s:/lib$:${base_libdir}:g ${S}/Makefile
}
-EXTRA_OEMAKE = 'CROSS=${HOST_PREFIX} TARGET_CFLAGS="${TOOLCHAIN_OPTIONS}" TARGET_LDFLAGS="${TOOLCHAIN_OPTIONS}" TARGET_SHLDFLAGS="${TOOLCHAIN_OPTIONS}"'
+EXTRA_OEMAKE = 'CROSS=${HOST_PREFIX} \
+ TARGET_CFLAGS="${TOOLCHAIN_OPTIONS} ${HOST_CC_ARCH}" \
+ TARGET_LDFLAGS="${TOOLCHAIN_OPTIONS}" \
+ TARGET_SHLDFLAGS="${TOOLCHAIN_OPTIONS}"'
EXTRA_OEMAKE_append_powerpc = ' HOST_CC="${BUILD_CC} -m32"'
EXTRA_OEMAKE_append_x86-64 = ' HOST_CC="${BUILD_CC}"'
EXTRA_OEMAKE_append_i586 = ' HOST_CC="${BUILD_CC} -m32"'
diff --git a/meta-oe/recipes-extended/acpica/acpitests_20140424.bb b/meta-oe/recipes-extended/acpica/acpitests_20140424.bb
index 7e145bb..e3c706c 100644
--- a/meta-oe/recipes-extended/acpica/acpitests_20140424.bb
+++ b/meta-oe/recipes-extended/acpica/acpitests_20140424.bb
@@ -18,7 +18,7 @@ SRC_URI[acpica.sha256sum] = "72ece982bbbdfb1b17418f1feb3a9daaa01803d0d41dcf00e19
S = "${WORKDIR}/acpitests-unix-${PV}"
-EXTRA_OEMAKE = "CC=${TARGET_PREFIX}gcc 'OPT_CFLAGS=-Wall'"
+EXTRA_OEMAKE = "'CC=${TARGET_PREFIX}gcc ${HOST_CC_ARCH}' 'OPT_CFLAGS=-Wall'"
# The Makefiles expect a specific layout
do_compile() {
More information about the Openembedded-commits
mailing list