diff options
| author | Martin Hundebøll <mnhu@prevas.dk> | 2018-01-17 10:58:20 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-19 12:37:13 +0000 |
| commit | 4128a5b5acdf79126eb1c1e0072bd0837af18b8f (patch) | |
| tree | a20be92e9687ee4b4a0da75bc45de82685c13191 /meta/recipes-core | |
| parent | 28364fb2b99f041a58cd0d7ec06788e6de1395d8 (diff) | |
| download | poky-4128a5b5acdf79126eb1c1e0072bd0837af18b8f.tar.gz | |
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.
(From OE-Core rev: d5f108349c0c052347b46fb7a8ed30fdec2b15c2)
Signed-off-by: Martin Hundebøll <mnhu@prevas.dk>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
| -rw-r--r-- | meta/recipes-core/glib-2.0/glib.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index aa86f28c2c..dc24a41a6a 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}" | |||
| 49 | EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux" | 49 | EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux" |
| 50 | 50 | ||
| 51 | # Tell configure that we'll have dbus-daemon on the target for the tests | 51 | # Tell configure that we'll have dbus-daemon on the target for the tests |
| 52 | EXTRA_OECONF_class-target_append = " ${@bb.utils.contains('PTEST_ENABLED', '1', ' ac_cv_prog_DBUS_DAEMON=dbus-daemon', '', d)}" | 52 | EXTRA_OECONF_append_class-target = " ${@bb.utils.contains('PTEST_ENABLED', '1', ' ac_cv_prog_DBUS_DAEMON=dbus-daemon', '', d)}" |
| 53 | 53 | ||
| 54 | do_configure_prepend() { | 54 | do_configure_prepend() { |
| 55 | sed -i -e '1s,#!.*,#!${USRBINPATH}/env python3,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in | 55 | sed -i -e '1s,#!.*,#!${USRBINPATH}/env python3,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in |