summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-10-21 10:28:49 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-26 15:59:17 +0100
commite0152db7651a43b34e1ad390f07d6f3a559c861d (patch)
tree9b045e2758555201e3b56593dcb77af6cccce20b
parentd531a566d4912d055abf8b41b1f910e4819c7b10 (diff)
downloadpoky-e0152db7651a43b34e1ad390f07d6f3a559c861d.tar.gz
gdk-pixbuf: use PACKAGECONFIG to control legacy X11 sub-library
Instead of appending and using overrides, turn gdk-pixbuf-xlib into a PACKAGECONFIG option and enable it for LSB-builds only. (From OE-Core rev: d75b659ca22991662c78e4e7913f75675acf7e66) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.28.2.bb13
1 files changed, 8 insertions, 5 deletions
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.28.2.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.28.2.bb
index 08d6f0aedc..d027fcf4f7 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.28.2.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.28.2.bb
@@ -26,15 +26,18 @@ inherit autotools pkgconfig gettext pixbufcache
26 26
27LIBV = "2.10.0" 27LIBV = "2.10.0"
28 28
29PACKAGECONFIG ??= ""
30PACKAGECONFIG_linuxstdbase = "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
31PACKAGECONFIG_class-native = ""
32PACKAGECONFIG[x11] = "--with-x11,--without-x11,virtual/libx11"
33
29EXTRA_OECONF = "\ 34EXTRA_OECONF = "\
30 --without-libtiff \
31 --with-libpng \ 35 --with-libpng \
32 ${X11DEPENDS} \ 36 --with-libjpeg \
37 --without-libtiff \
38 --without-libjasper \
33 --disable-introspection \ 39 --disable-introspection \
34" 40"
35X11DEPENDS = "--without-x11"
36X11DEPENDS_linuxstdbase = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x11', '--without-x11', d)}"
37X11DEPENDS_class-native = "--without-x11"
38 41
39PACKAGES =+ "${PN}-xlib" 42PACKAGES =+ "${PN}-xlib"
40 43