This is the correct version for the upgrade to glibc-2.12.2

1 files changed, 52 insertions, 50 deletions

diff --git a/14.0/glibc/glibc-multilib.SlackBuild b/14.0/glibc/glibc-multilib.SlackBuild
index 920a3f3..b4aabc4 100755
--- a/14.0/glibc/glibc-multilib.SlackBuild
+++ b/14.0/glibc/glibc-multilib.SlackBuild
@@ -48,6 +48,57 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+# I'll break this out as an option for fun  :-)
+case $ARCH  in
+  i386)
+    OPTIMIZ="-O3 -march=i386 -mcpu=i686"
+    LIBDIRSUFFIX=""
+    ;;
+  i486)
+    OPTIMIZ="-O3 -march=i486 -mtune=i686"
+    LIBDIRSUFFIX=""
+    ;;
+  i586)
+    OPTIMIZ="-O3 -march=i586"
+    LIBDIRSUFFIX=""
+    ;;
+  i686)
+    OPTIMIZ="-O3 -march=i686"
+    LIBDIRSUFFIX=""
+    ;;
+  athlon)
+    OPTIMIZ="-O3 -march=athlon"
+    LIBDIRSUFFIX=""
+    ;;
+  s390)
+    OPTIMIZ="-O3"
+    LIBDIRSUFFIX=""
+    ;;
+  x86_64)
+    OPTIMIZ="-O3 -fPIC"
+    LIBDIRSUFFIX="64"
+    ;;
+  *)
+    OPTIMIZ="-O3"
+    LIBDIRSUFFIX=""
+    ;;
+esac
+
+case $ARCH in
+  x86_64)
+    TARGET=${TARGET:-x86_64}
+    TARGET32=${TARGET32:-i486}
+    ;;
+  i486)
+    # This should be i486 for all 32-bit x86 arch:
+    TARGET=${TARGET:-i486}
+    ;;
+esac
+
+# Hand off the $ARCH variable to $SLACKWARE_ARCH to avoid confusing glibc:
+SLACKWARE_ARCH=$ARCH
+unset ARCH
+
 CVSVER=${VERSION}${CHECKOUT}
 
 # If we bootstrap the multilib glibc with a non-multilib version installed,
@@ -80,17 +131,6 @@ if ! grep -vq libutil-${VERSION}.so $CWD/doinst.sh-glibc ; then
   exit 1
 fi
 
-case $ARCH in
-  x86_64)
-    TARGET=${TARGET:-x86_64}
-    TARGET32=${TARGET32:-i486}
-    ;;
-  i486)
-    # This should be i486 for all 32-bit x86 arch:
-    TARGET=${TARGET:-i486}
-    ;;
-esac
-
 # This function fixes a doinst.sh file for x86_64.
 # With thanks to Fred Emmott.
 fix_doinst() {
@@ -106,7 +146,7 @@ fix_doinst() {
   # Fix "( cd lib" occurrences
   sed -i "s#( cd lib\$#( cd lib${LIBDIRSUFFIX}#" install/doinst.sh
 
-  if [ "$ARCH" = "x86_64" ]; then
+  if [ "$SLACKWARE_ARCH" = "x86_64" ]; then
     sed -i 's#ld-linux.so.2#ld-linux-x86-64.so.2#' install/doinst.sh
   fi
 
@@ -165,38 +205,6 @@ apply_patches() {
   )
 }
 
-# I'll break this out as an option for fun  :-)
-case $ARCH  in
-  i486)
-    OPTIMIZ="-O3 -march=i486 -mtune=i686"
-    LIBDIRSUFFIX=""
-    ;;
-  i586)
-    OPTIMIZ="-O3 -march=i586"
-    LIBDIRSUFFIX=""
-    ;;
-  i686)
-    OPTIMIZ="-O3 -march=i686"
-    LIBDIRSUFFIX=""
-    ;;
-  athlon)
-    OPTIMIZ="-O3 -march=athlon"
-    LIBDIRSUFFIX=""
-    ;;
-  s390)
-    OPTIMIZ="-O3"
-    LIBDIRSUFFIX=""
-    ;;
-  x86_64)
-    OPTIMIZ="-O3 -fPIC"
-    LIBDIRSUFFIX="64"
-    ;;
-  *)
-    OPTIMIZ="-O3"
-    LIBDIRSUFFIX=""
-    ;;
-esac
-
 # This is going to be the initial $DESTDIR:
 export PKG=$TMP/package-glibc-incoming-tree
 PGLIBC=$TMP/package-glibc
@@ -230,10 +238,6 @@ mkdir -p $PKG/usr/share
 mkdir -p $PKG/var/db/nscd
 mkdir -p $PKG/var/run/nscd
 
-# Hand off the $ARCH variable to $SLACKWARE_ARCH to avoid confusing glibc:
-SLACKWARE_ARCH=$ARCH
-unset ARCH
-
 # Begin extract/compile:
 cd $TMP
 rm -rf glibc-$CVSVER
@@ -312,8 +316,6 @@ fi
 # Make build directory:
 
 mkdir build-glibc-$VERSION
-# I think this was needed because glibc uses $SLACKWARE_ARCH differently
-#ln -sf build-glibc-$VERSION $SLACKWARE_ARCH
 cd build-glibc-$VERSION || exit 1
 
 echo "BUILDING DAS NPTL GLIBC"