# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1396475283 -7200
# Node ID 2cf493b6c670a8faabd4ebfa7221a04ff48f6067
# Parent  30cd20bf889ef2b2c25ca580caac871a91705064
ARM: gtk cross compile (exporting LIBTOOL to use cross tool was the fix)

diff -r 30cd20bf889e -r 2cf493b6c670 gtk+-demo/receipt
--- a/gtk+-demo/receipt	Wed Apr 02 13:44:10 2014 +0000
+++ b/gtk+-demo/receipt	Wed Apr 02 23:48:03 2014 +0200
@@ -8,6 +8,7 @@
 LICENSE="GPL2"
 WANTED="gtk+"
 WEB_SITE="http://www.gtk.org/"
+HOST_ARCH="i486 arm"
 
 DEPENDS="gtk+"
 
diff -r 30cd20bf889e -r 2cf493b6c670 gtk+-dev/receipt
--- a/gtk+-dev/receipt	Wed Apr 02 13:44:10 2014 +0000
+++ b/gtk+-dev/receipt	Wed Apr 02 23:48:03 2014 +0200
@@ -8,8 +8,10 @@
 LICENSE="GPL2"
 WANTED="gtk+"
 WEB_SITE="http://www.gtk.org/"
+HOST_ARCH="i486 arm"
 
-DEPENDS="cairo-dev glib-dev pango-dev atk-dev tiff-dev pkg-config libpng-dev jpeg-dev libgio-dev gtk+ gdk-pixbuf-dev libxml2-dev"
+DEPENDS="cairo-dev glib-dev pango-dev atk-dev tiff-dev pkg-config \
+libpng-dev jpeg-dev libgio-dev gtk+ gdk-pixbuf-dev libxml2-dev"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
@@ -21,6 +23,7 @@
 	cp -a $install/usr/lib/gtk-2.0 $fs/usr/lib
 	rm -rf $fs/usr/lib/gtk-2.0/2.10.0/*/*.so*
 	cp -a $install/usr/include $fs/usr
+	[ -d "$install/usr/share/gir-1.0" ] && \
+		cp -a $install/usr/share/gir-1.0 $fs/usr/share
 	cp -a $install/usr/share/aclocal $fs/usr/share
-	cp -a $install/usr/share/gir-1.0 $fs/usr/share
 }
diff -r 30cd20bf889e -r 2cf493b6c670 gtk+/receipt
--- a/gtk+/receipt	Wed Apr 02 13:44:10 2014 +0000
+++ b/gtk+/receipt	Wed Apr 02 23:48:03 2014 +0200
@@ -11,28 +11,27 @@
 WEB_SITE="http://www.gtk.org/"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION:0:4}/$TARBALL"
 CONFIG_FILES="/etc/gtk-2.0/gtk.immodules"
-
 HOST_ARCH="i486 arm"
-CROSS_BUGS="/bin/bash: no: command not found"
 
 DEPENDS="glibc-base expat libxcb xcb-util zlib glib cairo pango atk libpng \
 jpeg tiff gdk-pixbuf fontconfig freetype pixman libgio xorg-libX11 xorg-libXau \
 xorg-libXcomposite xorg-libXcursor xorg-libXdamage xorg-libXdmcp xorg-libXext \
 xorg-libXfixes xorg-libXinerama xorg-libXrender xorg-libXrandr"
-BUILD_DEPENDS="bash pkg-config xorg-xextproto cups-dev libcomerr3 \
-dbus-dev gobject-introspection-dev libffi-dev perl atk-dev pango-dev \
-cairo-dev gdk-pixbuf-dev libxml2-dev"
+BUILD_DEPENDS="atk-dev pango-dev gdk-pixbuf-dev dbus-dev dbus-glib-dev \
+xorg-inputproto libxcb-dev fontconfig-dev freetype-dev pixman-dev libxml2-dev \
+libpng-dev libffi-dev xorg-xextproto"
 
 # Handle cross compilation.
 case "$ARCH" in
-	arm*) 
-		BUILD_DEPENDS="atk-dev pango-dev gdk-pixbuf-dev dbus-dev dbus-glib-dev \
-xorg-inputproto"
+	i?86)
+		BUILD_DEPENDS="$BUILD_DEPENDS bash pkg-config cups-dev perl 
+		gobject-introspection-dev" ;;
+	arm*)
 		ARCH_ARGS="--enable-introspection=no --disable-glibtest --disable-cups \
---disable-papi --with-gdktarget=x11 --with-xinput --enable-display-migration \
-gio_can_sniff=yes"
-		export LDFLAGS=-L/cross/$ARCH/sysroot/usr/lib 
-		export CPPFLAGS=-I/cross/$ARCH/sysroot/usr/include ;;
+		--disable-papi --with-gdktarget=x11 --with-xinput gio_can_sniff=yes"
+		export LDFLAGS="$LDFLAGS -L/cross/$ARCH/sysroot/usr/lib"
+		export CPPFLAGS="$CPPFLAGS -I/cross/$ARCH/sysroot/usr/include"
+		export LIBTOOL=${HOST_SYSTEM}-libtool ;;
 esac
 
 # Rules to configure and make the package.
@@ -42,7 +41,7 @@
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--with-html-dir=/usr/share/doc \
-		$CONFIGURE_ARGS $ARCH_ARGS &&
+		$CONFIGURE_ARGS ${ARCH_ARGS} &&
 	# https://bugzilla.gnome.org/show_bug.cgi?id=655517
 	sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool &&
 	make $MAKEFLAGS &&