Updated for Slackware 13.1 and glibc-2.11.1

1 files changed, 33 insertions, 15 deletions

diff --git a/13.1/glibc/glibc-multilib.SlackBuild b/13.1/glibc/glibc-multilib.SlackBuild
index 4c34455..55583ab 100755
--- a/13.1/glibc/glibc-multilib.SlackBuild
+++ b/13.1/glibc/glibc-multilib.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -28,13 +28,25 @@
 # by Eric Hameleers <alien@slackware.com>
 
 
-VERSION=${VERSION:-2.9}
-CHECKOUT=${CHECKOUT:--20090316}
-BUILD=${BUILD:-3alien}
+VERSION=${VERSION:-2.11.1}
+CHECKOUT=${CHECKOUT:-""}
+BUILD=${BUILD:-1alien}
+
+## Included in glibc now:
+## glibc-libidn version
+#LIBIDNVER=2.10.1
+
 # $ARCH may be preset, otherwise i486 compatibility with i686 binary
 # structuring is the Slackware default, since this is what gcc-3.2+
 # requires for binary compatibility with previous releases.
-ARCH=${ARCH:-x86_64}
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 CVSVER=${VERSION}${CHECKOUT}
 
@@ -60,6 +72,8 @@ CWD=$(pwd)
 TMP=${TMP:-/glibc-tmp-$(mcookie)}
 mkdir -p $TMP
 
+NUMJOBS=${NUMJOBS:--j4}
+
 # Sanity check on the version number in the install scripts:
 if ! grep -vq libutil-$VERSION}.so $CWD/doinst.sh-glibc ; then
   echo "FATAL:  doinst.sh scripts have wrong version numbers."
@@ -130,14 +144,14 @@ apply_patches() {
   fi
   # Update the timezone information.
   ( cd timezone
-    tar xzf $CWD/tzdata2009d.tar.gz
+    tar xzf $CWD/tzdata?????.tar.gz
     chown root:root *
     mv yearistype.sh yearistype
     chmod 644 *
     chmod 755 yearistype
     mkdir tzcode
     cd tzcode
-    tar xzf $CWD/tzcode2009d.tar.gz
+    tar xzf $CWD/tzcode?????.tar.gz
     chown -R root:root .
     chmod 644 *
     cp -a *.c *.h ..
@@ -212,8 +226,12 @@ mkdir -p $PKG/var/run/nscd
 # Begin extract/compile:
 cd $TMP
 rm -rf glibc-$CVSVER
-tar xjvf $CWD/glibc-$CVSVER.tar.bz2
+tar xvf $CWD/glibc-$CVSVER.tar.xz \
+  || tar xvf $CWD/glibc-$CVSVER.tar.bz2 \
+  || tar xvf $CWD/glibc-$CVSVER.tar.gz
 cd glibc-$CVSVER
+#tar xvf $CWD/glibc-libidn-$LIBIDNVER.tar.?z*
+#mv glibc-libidn-$LIBIDNVER libidn
 
 # If we use this script to bootstrap a multilib glibc using a bare
 # statically compiled gcc, we need to disable linking to libgcc_eh:
@@ -259,7 +277,7 @@ build_glibc() {
     --without-cvs \
     $TARGET-slackware-linux
 
-    make -j4 || exit 1
+    make $NUMJOBS || exit 1
     make install install_root=$PKG || exit 1
     make localedata/install-locales install_root=$PKG || exit 1
 }
@@ -400,7 +418,7 @@ mkdir -p $PZONE/etc
 # This is already hard-coded into doinst.sh (like it'll be there anyway ;-):
 rm -f etc/localtime
 # Wrap it up:
-makepkg -l y -c n $TMP/glibc-zoneinfo-${VERSION}_multilib-noarch-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/glibc-zoneinfo-${VERSION}_multilib-noarch-$BUILD.txz
 
 # glibc-profile:
 cd $PPROFILE
@@ -417,7 +435,7 @@ if [ "x$LIBDIRSUFFIX" = "x64" ]; then
 fi
 mkdir install
 cp -a $CWD/slack-desc.glibc-profile install/slack-desc
-makepkg -l y -c n $TMP/glibc-profile-${VERSION}_multilib-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/glibc-profile-${VERSION}_multilib-$ARCH-$BUILD.txz
 
 # THIS IS NO LONGER PACKAGED (or is it?  might be better to let it be made, and then ship it or not...)
 # glibc-debug:
@@ -432,7 +450,7 @@ if [ "x$LIBDIRSUFFIX" = "x64" ]; then
 fi
 mkdir install
 cp -a $CWD/slack-desc.glibc-debug install/slack-desc
-makepkg -l y -c n $TMP/glibc-debug-${VERSION}_multilib-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/glibc-debug-${VERSION}_multilib-$ARCH-$BUILD.txz
 ## INSTEAD, NUKE THESE LIBS
 #rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/debug
 
@@ -452,7 +470,7 @@ cp -a $PKG/usr/share/i18n usr/share
 cp -a $PKG/usr/share/locale usr/share
 mkdir install
 cp -a $CWD/slack-desc.glibc-i18n install/slack-desc
-makepkg -l y -c n $TMP/glibc-i18n-${VERSION}_multilib-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/glibc-i18n-${VERSION}_multilib-$ARCH-$BUILD.txz
 
 # glibc-solibs:
 cd $PSOLIBS
@@ -503,7 +521,7 @@ fix_doinst
 # Ditch links:
 find . -type l -exec rm {} \;
 # Build the package:
-makepkg -l y -c n $TMP/glibc-solibs-${VERSION}_multilib-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/glibc-solibs-${VERSION}_multilib-$ARCH-$BUILD.txz
 
 # And finally, the complete "all-in-one" glibc package is created
 # from whatever was leftover:
@@ -525,7 +543,7 @@ fix_doinst
   mv incoming/libSegFault.so .
 )
 # Build the package:
-makepkg -l y -c n $TMP/glibc-${VERSION}_multilib-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/glibc-${VERSION}_multilib-$ARCH-$BUILD.txz
 
 # Done!
 echo