summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-28 18:21:02 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-03-01 00:17:46 +0000
commita73f94d9bfb4c4a49b14e78ef3ca5781d529c43a (patch)
treef5991a60db2e10831b2fc8ec0b9208366d64696a /meta
parent8ab7d766a185919dcb063226daf1980f575d0b93 (diff)
downloadpoky-a73f94d9bfb4c4a49b14e78ef3ca5781d529c43a.tar.gz
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. (From OE-Core rev: 45edf189961aff1858be9bb7b63116073c0a0c10) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oeqa/selftest/cases/reproducible.py1
-rw-r--r--meta/recipes-support/apr/apr-util_1.6.1.bb2
2 files changed, 2 insertions, 1 deletions
diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py
index 955773d7ca..bf7064d18b 100644
--- a/meta/lib/oeqa/selftest/cases/reproducible.py
+++ b/meta/lib/oeqa/selftest/cases/reproducible.py
@@ -36,7 +36,6 @@ exclude_packages = [
36 'go_', 36 'go_',
37 'go-', 37 'go-',
38 'gstreamer1.0-python', 38 'gstreamer1.0-python',
39 'libaprutil',
40 'lttng-tools-dbg', 39 'lttng-tools-dbg',
41 'lttng-tools-ptest', 40 'lttng-tools-ptest',
42 'ltp', 41 '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 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:'"
35do_configure_append() { 35do_configure_append() {
36 if [ "${CLASSOVERRIDE}" = "class-target" ]; then 36 if [ "${CLASSOVERRIDE}" = "class-target" ]; then
37 cp ${STAGING_DATADIR}/apr/apr_rules.mk ${B}/build/rules.mk 37 cp ${STAGING_DATADIR}/apr/apr_rules.mk ${B}/build/rules.mk
38 sed -i -e 's#^CFLAGS=.*#CFLAGS=${TARGET_CFLAGS}#g' ${B}/build/rules.mk
38 fi 39 fi
39} 40}
40do_configure_prepend_class-native() { 41do_configure_prepend_class-native() {
@@ -49,6 +50,7 @@ do_configure_append_class-native() {
49 50
50do_configure_prepend_class-nativesdk() { 51do_configure_prepend_class-nativesdk() {
51 cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk 52 cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk
53 sed -i -e 's#^CFLAGS=.*#CFLAGS=${TARGET_CFLAGS}#g' ${S}/build/rules.mk
52} 54}
53 55
54do_configure_append_class-nativesdk() { 56do_configure_append_class-nativesdk() {