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>

diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py
index 955773d7ca15b229c77e2fc762b2a47e5fbd4e3a..bf7064d18bae8589b3d059c42db152eb1774f428 100644 (file)
--- a/meta/lib/oeqa/selftest/cases/reproducible.py
+++ b/meta/lib/oeqa/selftest/cases/reproducible.py
@@ -36,7 +36,6 @@ exclude_packages = [
        'go_',
        'go-',
        'gstreamer1.0-python',
-       'libaprutil',
        'lttng-tools-dbg',
        'lttng-tools-ptest',
        'ltp',

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 f7d827a1d84be3a36b837c32d7c12f54cb4936c5..4e183ca3749fc8ec72bf60923f50d063737e7be7 100644 (file)
--- 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() {