SliTaz Repositories

     1.1 --- a/glib/receipt	Sat Jun 10 09:48:47 2017 +0300
     1.2 +++ b/glib/receipt	Sat Jun 10 12:36:39 2017 +0300
     1.3 @@ -15,7 +15,7 @@
     1.4  BUILD_DEPENDS="perl indent python zlib-dev libffi-dev gettext-tools elfutils-dev \
     1.5  pcre-dev gtk-doc libxslt libxml2-tools dbus-dev util-linux-mount-dev"
     1.6  BUILD_DEPENDS_arm="pcre-dev libffi-dev zlib-dev elfutils-dev libxml2-dev"
     1.7 -SPLIT="libgio libgio-dev glib-dev"
     1.8 +SPLIT="libgio glib libgio-dev glib-dev"
     1.9  
    1.10  # Rules to configure and make the package.
    1.11  compile_rules()
    1.12 @@ -23,15 +23,15 @@
    1.13  	case "$ARCH" in
    1.14  		i?86)
    1.15  			./configure \
    1.16 -				--sysconfdir=/etc \
    1.17 -				--with-pcre=system \
    1.18 -				$CONFIGURE_ARGS ;;
    1.19 +			--sysconfdir=/etc \
    1.20 +			--with-pcre=system \
    1.21 +			$CONFIGURE_ARGS ;;
    1.22  		arm*)
    1.23  			# Native ARM build --> if ARCH != SLITAZ_ARCH ?
    1.24  			export LD_LIBRARY_PATH=/cross/$ARCH/sysroot/usr/lib:/usr/lib:/lib
    1.25  			export PKG_CONFIG_PATH=/cross/$ARCH/sysroot/usr/lib/pkgconfig
    1.26  			export LDFLAGS="$LDFLAGS -L/cross/$ARCH/sysroot/usr/lib -Wl,-rpath=/cross/$ARCH/sysroot/usr/lib"
    1.27 -			
    1.28 +
    1.29  			# Glib
    1.30  			export glib_cv_stack_grows=${glib_cv_stack_grows=no}
    1.31  			export glib_cv_uscore=${glib_cv_uscore=no}
    1.32 @@ -50,38 +50,38 @@
    1.33  				--disable-rpath ;;
    1.34  	esac &&
    1.35  	make &&
    1.36 -	make install
    1.37 +	make DESTDIR=/ install &&
    1.38 +	make DESTDIR=$DESTDIR install
    1.39 +
    1.40 +	# we need `make DESTDIR=/ install` first because at the some stage (usual)
    1.41 +	# `make install` need file glib-2.0.pc installed in the FS.
    1.42 +	# `cook` is sure than this error is fatal.
    1.43 +	# Installing into / is safe since we working in the Aufs layer...
    1.44  }
    1.45  
    1.46  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.47  genpkg_rules()
    1.48  {
    1.49  	case $PACKAGE in
    1.50 +		libgio)
    1.51 +			copy libgio*.so*
    1.52 +			CAT="libs|libgio shared library"
    1.53 +			;;
    1.54  		glib)
    1.55  			copy bin/ *.so*
    1.56 -			# Split gio --> libgio
    1.57 -			rm $fs/usr/lib/libgio*
    1.58 +			remove_already_packed
    1.59  			# Python codegen, tester, Perl mkenums --> glib-dev
    1.60  			cd $fs/usr/bin; rm gdbus-codegen gtester* glib-mkenums
    1.61  			DEPENDS="pcre libffi libxml2 elfutils"
    1.62  			;;
    1.63 -		libgio)
    1.64 -			copy libgio*.so*
    1.65 -			CAT="libs|libgio shared library"
    1.66 -			;;
    1.67  		libgio-dev)
    1.68 -			copy gio/ libgio*.*a gio*.pc
    1.69 -			rm -rf $fs/usr/share
    1.70 +			copy *-2.0/gio/ libgio*.*a gio*.pc
    1.71  			CAT="development|libgio development files"
    1.72  			DEPENDS="libgio"
    1.73  			;;
    1.74  		glib-dev)
    1.75 -			# Python codegen, tester, compile, Perl mkenums
    1.76 -			copy @dev gdbus-codegen gtester* glib-mkenums
    1.77 -			# Remove libgio-dev
    1.78 -			rm -rf $fs/usr/lib/libgio*.*a
    1.79 -			rm -rf $fs/usr/include/gio-unix-2.0
    1.80 -			rm $fs/usr/lib/pkgconfig/gio*.pc
    1.81 +			copy @std @dev
    1.82 +			remove_already_packed
    1.83  			DEPENDS="glib perl python libffi-dev libgio libgio-dev pcre-dev \
    1.84  			pkg-config"
    1.85  			;;