wok-current rev 9253

Fix: glibc
author Antoine Bodin <gokhlayeh@slitaz.org>
date Tue Mar 15 01:41:33 2011 +0100 (2011-03-15)
parents 68b70f8bd2a4
children d3ef0f62e4ba
files glibc-dev/receipt glibc-locale/receipt glibc/receipt
line diff
     1.1 --- a/glibc-dev/receipt	Mon Mar 14 20:01:48 2011 +0000
     1.2 +++ b/glibc-dev/receipt	Tue Mar 15 01:41:33 2011 +0100
     1.3 @@ -21,8 +21,6 @@
     1.4      
     1.5      # Rm base files.
     1.6      echo -n "Removing all base files..."
     1.7 -    [ -s $WOK/glibc-base/taz/glibc-base-$VERSION/files.list ] ||
     1.8 -    tazwok genpkg glibc-base > /dev/null 2>&1
     1.9      for file in `cat $WOK/glibc-base/taz/glibc-base-$VERSION/files.list`
    1.10      do
    1.11      	rm -f ${fs}$file
    1.12 @@ -33,8 +31,6 @@
    1.13      
    1.14      # Rm locale.
    1.15      echo -n "Removing all locale files..."
    1.16 -    [ -s $WOK/glibc-base/taz/glibc-locale-$VERSION/files.list ] ||
    1.17 -    tazwok genpkg glibc-locale > /dev/null 2>&1
    1.18      for file in `cat $WOK/glibc-locale/taz/glibc-locale-$VERSION/files.list`
    1.19      do
    1.20      	rm -f ${fs}$file
     2.1 --- a/glibc-locale/receipt	Mon Mar 14 20:01:48 2011 +0000
     2.2 +++ b/glibc-locale/receipt	Tue Mar 15 01:41:33 2011 +0100
     2.3 @@ -26,7 +26,7 @@
     2.4  	cp -a $_pkg/usr/bin/tzselect $fs/usr/bin
     2.5  
     2.6  	# Rm base files.
     2.7 -	echo -n "Removing all base files..."
     2.8 +	echo -n "* Removing all base files..."
     2.9  	for file in `cat $WOK/glibc-base/taz/glibc-base-$VERSION/files.list`
    2.10  	do
    2.11  		rm -f ${fs}$file
    2.12 @@ -34,7 +34,7 @@
    2.13  	status
    2.14  	
    2.15  	# Rm glibc-extra-samba files.
    2.16 -	echo -n "Removing all base files..."
    2.17 +	echo -n "* Removing extra samba files..."
    2.18  	for file in `cat $WOK/glibc-extra-samba/taz/glibc-extra-samba-$VERSION/files.list`
    2.19  	do
    2.20  		rm -f ${fs}$file
     3.1 --- a/glibc/receipt	Mon Mar 14 20:01:48 2011 +0000
     3.2 +++ b/glibc/receipt	Tue Mar 15 01:41:33 2011 +0100
     3.3 @@ -10,8 +10,8 @@
     3.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
     3.5  WEB_SITE="http://www.gnu.org/software/libc/"
     3.6  WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
     3.7 -# Genpkg order: glibc-base, glibc-locale, glibc-dev.
     3.8 -COOK_OPT="genpkg=glibc-base:glib-locale:glibc-dev"
     3.9 +# Genpkg order: glibc-base, glibc-extra-samba, glibc-locale, glibc-dev.
    3.10 +COOK_OPT="genpkg=glibc-base:glibc-extra-samba:glib-locale:glibc-dev"
    3.11  	
    3.12  # Rules to compile & install the temporary toolchain.
    3.13  cook_tmp_toolchain()
    3.14 @@ -97,7 +97,6 @@
    3.15  		-e '/\*startfile_prefix_spec:/{n;s@.*@/usr/lib/ @}' \
    3.16  		-e '/\*cpp:/{n;s@$@ -isystem /usr/include@}' > \
    3.17  		`dirname $(gcc --print-libgcc-file-name)`/specs
    3.18 -	return 0
    3.19  }
    3.20  
    3.21  # Rules to gen a SliTaz package suitable for Tazpkg.