From: Martin Hundebøll <mnhu@prevas.dk>
Date: Wed, 17 Jan 2018 09:58:20 +0000 (+0100)
Subject: glib-2.0: fix EXTRA_OECONF append for PTEST
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~19059
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5f108349c0c052347b46fb7a8ed30fdec2b15c2;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

glib-2.0: fix EXTRA_OECONF append for PTEST

The order of '_append' and '_<override>' matters: '_append' must be
before overrides to have any effect.

Fix this in glib-2.0, so that EXTRA_OECONF is appended instead of
overwritten.

Signed-off-by: Martin Hundebøll <mnhu@prevas.dk>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---

diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index aa86f28c2cf..dc24a41a6a4 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -49,7 +49,7 @@ EXTRA_OECONF = "${PRINTF} ${CORECONF}"
 EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux"
 
 # Tell configure that we'll have dbus-daemon on the target for the tests
-EXTRA_OECONF_class-target_append = " ${@bb.utils.contains('PTEST_ENABLED', '1', ' ac_cv_prog_DBUS_DAEMON=dbus-daemon', '', d)}"
+EXTRA_OECONF_append_class-target = " ${@bb.utils.contains('PTEST_ENABLED', '1', ' ac_cv_prog_DBUS_DAEMON=dbus-daemon', '', d)}"
 
 do_configure_prepend() {
 	sed -i -e '1s,#!.*,#!${USRBINPATH}/env python3,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in