mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 17:19:20 +00:00
Code Issues Projects Releases Wiki Activity

glib-2.0: clean up EXTRA_OEMESON

Browse Source 
Instead of spreading the ptest enabling over the recipe, just add a
PACKAGECONFIG to enable the installed tests. Whether this is enabled respects
PTEST_ENABLED by default, so it always disabled in native and nativesdk builds.

This means we can remove the conditional dependency on dbus, all the conditional
enabling of installed tests, and clean up EXTRA_OEMESON.

(From OE-Core rev: 1e7c83c67c4a6e1ba61da5ffbf66dc0980624948)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2019-03-13 00:37:02 +00:00
committed by Richard Purdie
parent 02262c2a7b
commit d82c89a0d4
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-core/glib-2.0/glib.inc
+5 -8
View File
@@ -22,8 +22,7 @@ DEPENDS = "glib-2.0-native \
virtual/libintl \
virtual/libiconv \
libffi \
zlib \
${@bb.utils.contains('PTEST_ENABLED', '1', 'dbus', '', d)}"
zlib"
PACKAGES += "${PN}-codegen ${PN}-utils"
@@ -43,19 +42,17 @@ unset _PYTHON_SYSCONFIGDATA_NAME
S = "${WORKDIR}/glib-${PV}"
PACKAGECONFIG ??= "system-pcre libmount"
PACKAGECONFIG ??= "system-pcre libmount \
${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}"
# To use the system pcre it must be configured with --enable-unicode-properties
PACKAGECONFIG[system-pcre] = "-Dinternal_pcre=false,-Dinternal_pcre=true,libpcre"
PACKAGECONFIG[libmount] = "-Dlibmount=true,-Dlibmount=false,util-linux"
PACKAGECONFIG[manpages] = "-Dman=true, -Dman=false, libxslt-native xmlto-native"
# libelf is auto-detected without a configuration option
PACKAGECONFIG[libelf] = ",,elfutils"
PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false,dbus"
CORECONF = "-Ddtrace=false -Dfam=false -Dsystemtap=false -Dselinux=false"
EXTRA_OEMESON = "${CORECONF} ${@bb.utils.contains('PTEST_ENABLED', '1', '-Dinstalled_tests=true', '-Dinstalled_tests=false', d)}"
EXTRA_OEMESON_class-native = "${CORECONF} -Dinstalled_tests=false"
EXTRA_OEMESON_class-nativesdk = "${CORECONF} -Dinstalled_tests=false"
EXTRA_OEMESON = "-Ddtrace=false -Dfam=false -Dsystemtap=false -Dselinux=false"
do_configure_prepend() {
sed -i -e '1s,#!.*,#!${USRBINPATH}/env python3,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in