SliTaz Repositories

     1.1 --- a/glib/receipt	Mon Feb 24 17:36:28 2014 +0100
     1.2 +++ b/glib/receipt	Wed Mar 05 03:32:36 2014 +0100
     1.3 @@ -2,7 +2,6 @@
     1.4  
     1.5  PACKAGE="glib"
     1.6  VERSION="2.32.4"
     1.7 -#VERSION="2.34.3"
     1.8  CATEGORY="x-window"
     1.9  SHORT_DESC="C routines."
    1.10  MAINTAINER="pankso@slitaz.org"
    1.11 @@ -10,9 +9,9 @@
    1.12  TARBALL="$PACKAGE-$VERSION.tar.xz"
    1.13  WEB_SITE="http://www.gtk.org/"
    1.14  WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION:0:4}/$TARBALL"
    1.15 -#HOST_ARCH="i486 arm"
    1.16 -CROSS_BUGS="2.32.4: error: cannot compute alignment of guint32 
    1.17 -      2.34.3: Buggy shared libs format (libpcre, libffi)"
    1.18 +HOST_ARCH="i486 arm"
    1.19 +
    1.20 +CROSS_BUGS="arm: glib 2.32.4 error: cannot compute alignment of guint32"
    1.21  
    1.22  DEPENDS="pcre libffi libxml2 elfutils"
    1.23  BUILD_DEPENDS="pcre-dev libffi-dev gettext zlib-dev perl python python-dev \
    1.24 @@ -20,21 +19,39 @@
    1.25  
    1.26  # Handle cross comilation. Use host Perl, Python, etc
    1.27  case "$ARCH" in
    1.28 -	arm) BUILD_DEPENDS="pcre-dev libffi-dev zlib-dev elfutils-dev libxml2-dev" ;;
    1.29 +	arm)
    1.30 +		VERSION="2.34.3"
    1.31 +		TARBALL="$PACKAGE-$VERSION.tar.xz"
    1.32 +		WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION:0:4}/$TARBALL"
    1.33 +		BUILD_DEPENDS="pcre-dev libffi-dev zlib-dev elfutils-dev libxml2-dev" ;;
    1.34  esac
    1.35  
    1.36  # Rules to configure and make the package.
    1.37  compile_rules()
    1.38  {
    1.39  	case "$ARCH" in
    1.40 +		i?68)
    1.41 +			./configure \
    1.42 +				--sysconfdir=/etc \
    1.43 +				--with-pcre=system \
    1.44 +				$CONFIGURE_ARGS ;;
    1.45  		arm)
    1.46 +			# Native ARM build --> if ARCH != SLITAZ_ARCH ?
    1.47 +			
    1.48 +			# Libtool fixes: /usr/bin/cross libhack (when released)
    1.49 +			sed -i s"#/usr/lib#/cross/$ARCH/sysroot/usr/lib#" \
    1.50 +				/cross/${ARCH}/sysroot/usr/lib/libpcre.la \
    1.51 +				/cross/${ARCH}/sysroot/usr/lib/libffi.la || exit 1
    1.52 +			#export LIBTOOL=arm-slitaz-linux-gnueabi-libtool 
    1.53 +			export LD_LIBRARY_PATH=/cross/arm/sysroot/usr/lib:/usr/lib:/lib
    1.54 +			export PKG_CONFIG_LIBPATH=/cross/arm/sysroot/usr/lib/pkgconfig
    1.55 +			
    1.56 +			# Glib
    1.57  			export glib_cv_stack_grows=${glib_cv_stack_grows=no}
    1.58  			export glib_cv_uscore=${glib_cv_uscore=no}
    1.59  			export ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=no}
    1.60  			export ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=no}
    1.61  			export ac_cv_type_long_long=${ac_cv_type_long_long=yes}
    1.62 -			export LD_LIBRARY_PATH=/cross/arm/sysroot/usr/lib:/usr/lib:/lib:/usr/local/lib
    1.63 -			export PKG_CONFIG_LIBPATH=/cross/arm/sysroot/usr/lib/pkgconfig
    1.64  			CC="arm-slitaz-linux-gnueabi-gcc" \
    1.65  			./configure \
    1.66  				--sysconfdir=/etc \
    1.67 @@ -43,11 +60,6 @@
    1.68  				--host=arm-slitaz-linux-gnueabi \
    1.69  				--enable-shared=yes \
    1.70  				--enable-static=yes ;;
    1.71 -		*)
    1.72 -			./configure \
    1.73 -				--sysconfdir=/etc \
    1.74 -				--with-pcre=system \
    1.75 -				$CONFIGURE_ARGS ;;
    1.76  	esac && 
    1.77  	make && make install
    1.78  }