diff options
| author | Ross Burton <ross.burton@intel.com> | 2013-10-21 10:28:49 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-10-26 15:53:24 +0100 |
| commit | d75b659ca22991662c78e4e7913f75675acf7e66 (patch) | |
| tree | 8079a4d0d0d00f72b1c4d411e4cc6a5327f71c27 | |
| parent | b1252f91ef62ce62d4d55269f498b5692aba76e8 (diff) | |
| download | openembedded-core-d75b659ca22991662c78e4e7913f75675acf7e66.tar.gz openembedded-core-d75b659ca22991662c78e4e7913f75675acf7e66.tar.bz2 openembedded-core-d75b659ca22991662c78e4e7913f75675acf7e66.zip | |
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.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
| -rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.28.2.bb | 13 |
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 LIBV = "2.10.0" +PACKAGECONFIG ??= "" +PACKAGECONFIG_linuxstdbase = "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" +PACKAGECONFIG_class-native = "" +PACKAGECONFIG[x11] = "--with-x11,--without-x11,virtual/libx11" + EXTRA_OECONF = "\ - --without-libtiff \ --with-libpng \ - ${X11DEPENDS} \ + --with-libjpeg \ + --without-libtiff \ + --without-libjasper \ --disable-introspection \ " -X11DEPENDS = "--without-x11" -X11DEPENDS_linuxstdbase = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x11', '--without-x11', d)}" -X11DEPENDS_class-native = "--without-x11" PACKAGES =+ "${PN}-xlib" |