[oe-commits] Phil Blundell : gtk+: remove special-casing for native installation, declare provider for gdk-pixbuf-csource-native when building natively

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 0135ae31d148e2175a0d7d9a92180d70b4a8e0b5
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=0135ae31d148e2175a0d7d9a92180d70b4a8e0b5

Author: Phil Blundell <philb at gnu.org>
Date:   Tue Mar  9 20:38:16 2010 +0000

gtk+: remove special-casing for native installation, declare provider for gdk-pixbuf-csource-native when building natively
(based on original patch from Graeme Gregory <dp at xora.org.uk> with minor edits)

---

 recipes/gtk+/gtk+.inc       |    2 +-
 recipes/gtk+/gtk+_2.18.6.bb |   10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/recipes/gtk+/gtk+.inc b/recipes/gtk+/gtk+.inc
index e6a0684..268657b 100644
--- a/recipes/gtk+/gtk+.inc
+++ b/recipes/gtk+/gtk+.inc
@@ -5,7 +5,7 @@ SECTION = "libs"
 LICENSE = "LGPL"
 PRIORITY = "optional"
 DEPENDS = "glib-2.0 tiff pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cups \
-	   libxrandr libxdamage libxrender libxcomposite cairo jasper"
+	   libxrandr libxdamage libxrender libxcomposite cairo jasper gtk+-native"
 PROVIDES = "gdk-pixbuf"
 
 MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
diff --git a/recipes/gtk+/gtk+_2.18.6.bb b/recipes/gtk+/gtk+_2.18.6.bb
index 9321b43..8546591 100644
--- a/recipes/gtk+/gtk+_2.18.6.bb
+++ b/recipes/gtk+/gtk+_2.18.6.bb
@@ -8,20 +8,14 @@ PR = "${INC_PR}.3"
 BBCLASSEXTEND = "native"
 
 DEPENDS_virtclass-native = "libpng-native atk-native pango-native cairo-native libxrender-native"
+PROVIDES_virtclass-native = "gdk-pixbuf-csource-native"
 
 # Enable xkb selectively
 XKBTOGGLE = " --disable-xkb"
 XKBTOGGLE_angstrom = ""
 
 EXTRA_OECONF = "--with-libtiff ${XKBTOGGLE} --disable-glibtest gio_can_sniff=yes"
-EXTRA_OECONF_append_virtclass-native = " --without-libtiff --without-libjpeg --disable-modules"
-
-do_install_virtclass-native () {
-	autotools_do_install
-	find ${D}${libdir} -name "libpixbufloader-*.la" -exec rm \{\} \;
-	rm ${D}${bindir}/gdk-pixbuf-csource
-	echo "going native!"
-}
+EXTRA_OECONF_append_virtclass-native = " --without-libtiff --without-libjpeg"
 
 PACKAGES_DYNAMIC = "gtk-module-* gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*"