summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-28 18:21:02 +0000
committerAnuj Mittal <anuj.mittal@intel.com>2021-03-19 16:03:25 +0800
commitca466a17fb18334f307e2241c65f25d024f0a164 (patch)
tree5b2d3dfe9d5f36c0bd7aa4f32c95cd65d96560b3
parent6e45dd0c65099f0d5f9df0ee052ba3c9ed67f727 (diff)
downloadopenembedded-core-contrib-ca466a17fb18334f307e2241c65f25d024f0a164.tar.gz
openembedded-core-contrib-ca466a17fb18334f307e2241c65f25d024f0a164.tar.bz2
openembedded-core-contrib-ca466a17fb18334f307e2241c65f25d024f0a164.zip
apr-util: Fix CFLAGS used in build
We need to use CFLAGS with the correct WORKDIR in them, replace those in the sysroot file with the ones appropriate to the current recipe. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 45edf189961aff1858be9bb7b63116073c0a0c10) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-rw-r--r--meta/recipes-support/apr/apr-util_1.6.1.bb2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/recipes-support/apr/apr-util_1.6.1.bb b/meta/recipes-support/apr/apr-util_1.6.1.bb
index f7d827a1d8..4e183ca374 100644
--- a/meta/recipes-support/apr/apr-util_1.6.1.bb
+++ b/meta/recipes-support/apr/apr-util_1.6.1.bb
@@ -35,6 +35,7 @@ OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
do_configure_append() {
if [ "${CLASSOVERRIDE}" = "class-target" ]; then
cp ${STAGING_DATADIR}/apr/apr_rules.mk ${B}/build/rules.mk
+ sed -i -e 's#^CFLAGS=.*#CFLAGS=${TARGET_CFLAGS}#g' ${B}/build/rules.mk
fi
}
do_configure_prepend_class-native() {
@@ -49,6 +50,7 @@ do_configure_append_class-native() {
do_configure_prepend_class-nativesdk() {
cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk
+ sed -i -e 's#^CFLAGS=.*#CFLAGS=${TARGET_CFLAGS}#g' ${S}/build/rules.mk
}
do_configure_append_class-nativesdk() {