Skip to contentSkip to conversation

apr-util: Fix CFLAGS used in build

PATCH New Richard Purdie 1 participant 3 messages Mar 1, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 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.

---
 meta/lib/oeqa/selftest/cases/reproducible.py | 1 -
 meta/recipes-support/apr/apr-util_1.6.1.bb   | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)
meta/lib/oeqa/selftest/cases/reproducible.py +0 -1
index ad15d4dffe2..1fb2806f2a8 100644
@@ -36,7 +36,6 @@ exclude_packages = [
 	'go_',
 	'go-',
 	'gstreamer1.0-python',
-	'libaprutil',
 	'lttng-tools-dbg',
 	'lttng-tools-ptest',
 	'ltp',
meta/recipes-support/apr/apr-util_1.6.1.bb +2 -0
index f7d827a1d84..4e183ca3749 100644
@@ -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() {
Signature · 1 line
2.27.0
#1 lore raw

PATCH 2/3 gstreamer1.0-python: Set internal python library path correcty

The library hardcodes paths to the python library internally and currently these are build paths. Fix this to use the correct target path and fix reproducibility in the process.

---
 meta/lib/oeqa/selftest/cases/reproducible.py                    | 1 -
 meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.3.bb | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)
meta/lib/oeqa/selftest/cases/reproducible.py +0 -1
index 1fb2806f2a8..a15601e5e5d 100644
@@ -35,7 +35,6 @@ exclude_packages = [
 	'go-runtime',
 	'go_',
 	'go-',
-	'gstreamer1.0-python',
 	'lttng-tools-dbg',
 	'lttng-tools-ptest',
 	'ltp',
meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.3.bb +2 -0
index 897d2467937..de78fe84452 100644
@@ -15,6 +15,8 @@ PNREAL = "gst-python"
 
 S = "${WORKDIR}/${PNREAL}-${PV}"
 
+EXTRA_OEMESON += "-Dlibpython-dir=${libdir}"
+
 # gobject-introspection is mandatory and cannot be configured
 REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
 UNKNOWN_CONFIGURE_WHITELIST_append = " introspection"
Signature · 1 line
2.27.0
#2 lore raw

PATCH 3/3 diffoscope: Upgrade 167 -> 168

In reply to Richard Purdie

This includes a fix for the 'hang' on larger diffs with html output as seen on the autobuilder.

---
 .../diffoscope/{diffoscope_167.bb => diffoscope_168.bb}         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-support/diffoscope/{diffoscope_167.bb => diffoscope_168.bb} (88%)
meta/recipes-support/diffoscope/diffoscope_168.bb renamed from meta/recipes-support/diffoscope/diffoscope_167.bb +1 -1
similarity index 88%
rename from meta/recipes-support/diffoscope/diffoscope_167.bb
rename to meta/recipes-support/diffoscope/diffoscope_168.bb
index 74cd8090719..9d112d2ce88 100644
@@ -7,7 +7,7 @@ PYPI_PACKAGE = "diffoscope"
 
 inherit pypi setuptools3
 
-SRC_URI[sha256sum] = "d95cef5b3eef49fa1c811c1ac103f7f7cca4a0ebabc674e4283b51f28309d242"
+SRC_URI[sha256sum] = "c6f1dc3e75b7e2e5ceac4f857fbd2ee0ddb3f0169c2b39ea9187af34208e98de"
 
 RDEPENDS_${PN} += "binutils vim squashfs-tools python3-libarchive-c python3-magic python3-rpm"
 
Signature · 1 line
2.27.0