wok-current diff pango/receipt @ rev 16167

ARM: improve slitaz-configs*
author Christophe Lincoln <pankso@slitaz.org>
date Sat Mar 29 13:56:21 2014 +0100 (2014-03-29)
parents 1a0b3262dccf
children 63198d8bd812
line diff
     1.1 --- a/pango/receipt	Tue Mar 18 22:35:00 2014 +0100
     1.2 +++ b/pango/receipt	Sat Mar 29 13:56:21 2014 +0100
     1.3 @@ -10,7 +10,7 @@
     1.4  WEB_SITE="http://www.pango.org/"
     1.5  WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION:0:4}/$TARBALL"
     1.6  CONFIG_FILES="/etc/pango/pango.modules"
     1.7 -#HOST_ARCH="i486 arm"
     1.8 +HOST_ARCH="i486 arm"
     1.9  
    1.10  DEPENDS="cairo glib expat libxml2 xorg-libXft fontconfig freetype xcb-util \
    1.11  bzlib slitaz-base-files gcc-lib-base"
    1.12 @@ -19,33 +19,33 @@
    1.13  
    1.14  # Handle cross compilation
    1.15  case "$ARCH" in
    1.16 -	i?86) BUILD_DEPENDS="$BUILD_DEPENDS gobject-introspection-dev" ;;
    1.17 -	arm*) export LDFLAGS="-L/cross/$ARCH/sysroot/usr/lib" ;;
    1.18 +	i?86)
    1.19 +		BUILD_DEPENDS="$BUILD_DEPENDS gobject-introspection-dev" ;;
    1.20 +	arm*)
    1.21 +		export LIBTOOL=${HOST_SYSTEM}-libtool
    1.22 +		ARCH_ARGS="--enable-introspection=no" ;;
    1.23  esac
    1.24  
    1.25 -# Rules to configure and make the package.
    1.26 +# Rules to configure and make the package. 
    1.27  compile_rules()
    1.28  {
    1.29 -    cd $src
    1.30 -    ./configure \
    1.31 -    	--prefix=/usr \
    1.32 -    	--sysconfdir=/etc \
    1.33 -    	--mandir=/usr/share/man \
    1.34 -    	--with-html-dir=/usr/share/doc \
    1.35 -    	$CONFIGURE_ARGS &&
    1.36 -    make &&
    1.37 -    make DESTDIR=$DESTDIR install
    1.38 +	./configure \
    1.39 +		--prefix=/usr \
    1.40 +		--sysconfdir=/etc \
    1.41 +		--with-html-dir=/usr/share/doc \
    1.42 +		$CONFIGURE_ARGS $ARCH_ARGS &&
    1.43 +	make && make install
    1.44  }
    1.45  
    1.46  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.47  genpkg_rules()
    1.48  {
    1.49 -	mkdir -p $fs/usr/bin $fs/usr/lib
    1.50 +	mkdir -p $fs/usr/bin $fs/usr/lib $fs/etc/pango
    1.51      cp -a $install/usr/bin/* $fs/usr/bin
    1.52      cp -a $install/usr/lib/*.so* $fs/usr/lib
    1.53      cp -a $install/usr/lib/pango $fs/usr/lib
    1.54      rm -rf $fs/usr/lib/pango/1.6.0/modules/*.la
    1.55 -    cp -a $install/etc $fs
    1.56 +    [ -d "$install/etc" ] && cp -a $install/etc $fs
    1.57      touch $fs/etc/pango/pango.modules
    1.58  }
    1.59  
    1.60 @@ -54,6 +54,6 @@
    1.61  {
    1.62      echo "Processing post-install commands..."
    1.63      # Rebuilds pango.modules when installed.
    1.64 -    chroot $1/ /usr/bin/pango-querymodules > $1/etc/pango/pango.modules
    1.65 +    chroot $root/ /usr/bin/pango-querymodules > /etc/pango/pango.modules
    1.66  }
    1.67