# HG changeset patch # User Antoine Bodin # Date 1300149693 -3600 # Node ID 14f4c5e142ff8191012caae2234df2f5fb2225e1 # Parent 68b70f8bd2a48bb280a7ce51565119d15b4552c0 Fix: glibc diff -r 68b70f8bd2a4 -r 14f4c5e142ff glibc-dev/receipt --- a/glibc-dev/receipt Mon Mar 14 20:01:48 2011 +0000 +++ b/glibc-dev/receipt Tue Mar 15 01:41:33 2011 +0100 @@ -21,8 +21,6 @@ # Rm base files. echo -n "Removing all base files..." - [ -s $WOK/glibc-base/taz/glibc-base-$VERSION/files.list ] || - tazwok genpkg glibc-base > /dev/null 2>&1 for file in `cat $WOK/glibc-base/taz/glibc-base-$VERSION/files.list` do rm -f ${fs}$file @@ -33,8 +31,6 @@ # Rm locale. echo -n "Removing all locale files..." - [ -s $WOK/glibc-base/taz/glibc-locale-$VERSION/files.list ] || - tazwok genpkg glibc-locale > /dev/null 2>&1 for file in `cat $WOK/glibc-locale/taz/glibc-locale-$VERSION/files.list` do rm -f ${fs}$file diff -r 68b70f8bd2a4 -r 14f4c5e142ff glibc-locale/receipt --- a/glibc-locale/receipt Mon Mar 14 20:01:48 2011 +0000 +++ b/glibc-locale/receipt Tue Mar 15 01:41:33 2011 +0100 @@ -26,7 +26,7 @@ cp -a $_pkg/usr/bin/tzselect $fs/usr/bin # Rm base files. - echo -n "Removing all base files..." + echo -n "* Removing all base files..." for file in `cat $WOK/glibc-base/taz/glibc-base-$VERSION/files.list` do rm -f ${fs}$file @@ -34,7 +34,7 @@ status # Rm glibc-extra-samba files. - echo -n "Removing all base files..." + echo -n "* Removing extra samba files..." for file in `cat $WOK/glibc-extra-samba/taz/glibc-extra-samba-$VERSION/files.list` do rm -f ${fs}$file diff -r 68b70f8bd2a4 -r 14f4c5e142ff glibc/receipt --- a/glibc/receipt Mon Mar 14 20:01:48 2011 +0000 +++ b/glibc/receipt Tue Mar 15 01:41:33 2011 +0100 @@ -10,8 +10,8 @@ TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://www.gnu.org/software/libc/" WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" -# Genpkg order: glibc-base, glibc-locale, glibc-dev. -COOK_OPT="genpkg=glibc-base:glib-locale:glibc-dev" +# Genpkg order: glibc-base, glibc-extra-samba, glibc-locale, glibc-dev. +COOK_OPT="genpkg=glibc-base:glibc-extra-samba:glib-locale:glibc-dev" # Rules to compile & install the temporary toolchain. cook_tmp_toolchain() @@ -97,7 +97,6 @@ -e '/\*startfile_prefix_spec:/{n;s@.*@/usr/lib/ @}' \ -e '/\*cpp:/{n;s@$@ -isystem /usr/include@}' > \ `dirname $(gcc --print-libgcc-file-name)`/specs - return 0 } # Rules to gen a SliTaz package suitable for Tazpkg.