diff options
-rw-r--r-- | meta/recipes-core/glib-2.0/glib.inc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index 3c2440db0e..6f0ec1ad2e 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc | |||
@@ -22,8 +22,7 @@ DEPENDS = "glib-2.0-native \ | |||
22 | virtual/libintl \ | 22 | virtual/libintl \ |
23 | virtual/libiconv \ | 23 | virtual/libiconv \ |
24 | libffi \ | 24 | libffi \ |
25 | zlib \ | 25 | zlib" |
26 | ${@bb.utils.contains('PTEST_ENABLED', '1', 'dbus', '', d)}" | ||
27 | 26 | ||
28 | PACKAGES += "${PN}-codegen ${PN}-utils" | 27 | PACKAGES += "${PN}-codegen ${PN}-utils" |
29 | 28 | ||
@@ -43,19 +42,17 @@ unset _PYTHON_SYSCONFIGDATA_NAME | |||
43 | 42 | ||
44 | S = "${WORKDIR}/glib-${PV}" | 43 | S = "${WORKDIR}/glib-${PV}" |
45 | 44 | ||
46 | PACKAGECONFIG ??= "system-pcre libmount" | 45 | PACKAGECONFIG ??= "system-pcre libmount \ |
46 | ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" | ||
47 | # To use the system pcre it must be configured with --enable-unicode-properties | 47 | # To use the system pcre it must be configured with --enable-unicode-properties |
48 | PACKAGECONFIG[system-pcre] = "-Dinternal_pcre=false,-Dinternal_pcre=true,libpcre" | 48 | PACKAGECONFIG[system-pcre] = "-Dinternal_pcre=false,-Dinternal_pcre=true,libpcre" |
49 | PACKAGECONFIG[libmount] = "-Dlibmount=true,-Dlibmount=false,util-linux" | 49 | PACKAGECONFIG[libmount] = "-Dlibmount=true,-Dlibmount=false,util-linux" |
50 | PACKAGECONFIG[manpages] = "-Dman=true, -Dman=false, libxslt-native xmlto-native" | 50 | PACKAGECONFIG[manpages] = "-Dman=true, -Dman=false, libxslt-native xmlto-native" |
51 | # libelf is auto-detected without a configuration option | 51 | # libelf is auto-detected without a configuration option |
52 | PACKAGECONFIG[libelf] = ",,elfutils" | 52 | PACKAGECONFIG[libelf] = ",,elfutils" |
53 | PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false,dbus" | ||
53 | 54 | ||
54 | CORECONF = "-Ddtrace=false -Dfam=false -Dsystemtap=false -Dselinux=false" | 55 | EXTRA_OEMESON = "-Ddtrace=false -Dfam=false -Dsystemtap=false -Dselinux=false" |
55 | |||
56 | EXTRA_OEMESON = "${CORECONF} ${@bb.utils.contains('PTEST_ENABLED', '1', '-Dinstalled_tests=true', '-Dinstalled_tests=false', d)}" | ||
57 | EXTRA_OEMESON_class-native = "${CORECONF} -Dinstalled_tests=false" | ||
58 | EXTRA_OEMESON_class-nativesdk = "${CORECONF} -Dinstalled_tests=false" | ||
59 | 56 | ||
60 | do_configure_prepend() { | 57 | do_configure_prepend() { |
61 | sed -i -e '1s,#!.*,#!${USRBINPATH}/env python3,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in | 58 | sed -i -e '1s,#!.*,#!${USRBINPATH}/env python3,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in |