Slackware 13.1slackware-13.1

Wed May 19 08:58:23 UTC 2010
Slackware 13.1 x86_64 stable is released!
Lots of thanks are due -- see the RELEASE_NOTES and the rest of the
ChangeLog for credits.  The ISOs are on their way to replication,
a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD.
We are taking pre-orders now at store.slackware.com, and offering
a discount if you sign up for a subscription.  Consider picking up
a copy to help support the project.  Thanks again to the Slackware
community for testing, contributing, and generally holding us to a
high level of quality.  :-)
Enjoy!

2 files changed, 65 insertions, 44 deletions

diff --git a/source/d/libtool/libtool.SlackBuild b/source/d/libtool/libtool.SlackBuild
index fb833a720..75a0ff2c1 100755
--- a/source/d/libtool/libtool.SlackBuild
+++ b/source/d/libtool/libtool.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -9,7 +9,7 @@
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
 #  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 #  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
 #  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
@@ -20,11 +20,20 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+VERSION=${VERSION:-$(echo libtool-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-2}
 
-VERSION=1.5.26
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
-BUILD=${BUILD:-1}
+NUMJOBS=${NUMJOBS:--j6}
+
+# Automatically determine the architecture we're building on:
+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
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -36,20 +45,21 @@ if [ "$ARCH" = "i486" ]; then
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
-
 cd $TMP
 rm -rf libtool-$VERSION
+
 tar xvf $CWD/libtool-$VERSION.tar.?z* || exit 1
+
 cd libtool-$VERSION
 chown -R root:root .
 find . \
@@ -60,7 +70,6 @@ find . \
 
 zcat $CWD/libtool.no.moved.warning.diff.gz | patch -p1 --verbose || exit 1 
 
-
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -70,7 +79,7 @@ CFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
+make install DESTDIR=$PKG
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
@@ -81,12 +90,12 @@ gzip -9 $PKG/usr/info/*
 mkdir -p $PKG/usr/doc/libtool-$VERSION
 cp -a \
   AUTHORS COPYING NEWS README THANKS TODO \
-  $PKG/usr/doc/libtool-$VERSION
+    $PKG/usr/doc/libtool-$VERSION
 
 mkdir $PKG/install
 zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/libtool-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/libtool-${VERSION}-$ARCH-$BUILD.txz
 
diff --git a/source/d/libtool/libtool.no.moved.warning.diff b/source/d/libtool/libtool.no.moved.warning.diff
index e5197b5c6..f6a82285a 100644
--- a/source/d/libtool/libtool.no.moved.warning.diff
+++ b/source/d/libtool/libtool.no.moved.warning.diff
@@ -1,32 +1,44 @@
-diff -Nur libtool-1.5.26.orig/libltdl/ltmain.sh libtool-1.5.26/libltdl/ltmain.sh
---- libtool-1.5.26.orig/libltdl/ltmain.sh	2008-02-01 10:39:51.000000000 -0600
-+++ libtool-1.5.26/libltdl/ltmain.sh	2008-10-01 13:59:24.654020673 -0500
-@@ -2952,9 +2952,9 @@
- 		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
- 		    exit $EXIT_FAILURE
- 		  fi
--		  if test "$absdir" != "$libdir"; then
--		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
--		  fi
-+		  #if test "$absdir" != "$libdir"; then
-+		  #  $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-+		  #fi
- 		  path="$absdir"
+--- ./libltdl/config/ltmain.m4sh.orig	2009-11-16 07:17:22.000000000 -0600
++++ ./libltdl/config/ltmain.m4sh	2010-02-06 18:13:00.000000000 -0600
+@@ -4965,7 +4965,7 @@
+ 	# Find the relevant object directory and library name.
+ 	if test "X$installed" = Xyes; then
+ 	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+-	    func_warning "library \`$lib' was moved."
++	    # func_warning "library \`$lib' was moved."
+ 	    dir="$ladir"
+ 	    absdir="$abs_ladir"
+ 	    libdir="$abs_ladir"
+@@ -5496,8 +5496,8 @@
+ 		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ 		  test -z "$libdir" && \
+ 		    func_fatal_error "\`$deplib' is not a valid libtool archive"
+-		  test "$absdir" != "$libdir" && \
+-		    func_warning "\`$deplib' seems to be moved"
++		  # test "$absdir" != "$libdir" && \
++		  #   func_warning "\`$deplib' seems to be moved"
+ 
+ 		  path="-L$absdir"
  		fi
- 		depdepl=
-diff -Nur libtool-1.5.26.orig/ltmain.sh libtool-1.5.26/ltmain.sh
---- libtool-1.5.26.orig/ltmain.sh	2008-02-01 10:39:51.000000000 -0600
-+++ libtool-1.5.26/ltmain.sh	2008-10-01 13:59:24.690024584 -0500
-@@ -2952,9 +2952,9 @@
- 		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
- 		    exit $EXIT_FAILURE
- 		  fi
--		  if test "$absdir" != "$libdir"; then
--		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
--		  fi
-+		  #if test "$absdir" != "$libdir"; then
-+		  #  $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-+		  #fi
- 		  path="$absdir"
+--- ./libltdl/config/ltmain.sh.orig	2009-11-16 07:23:18.000000000 -0600
++++ ./libltdl/config/ltmain.sh	2010-02-06 18:13:26.000000000 -0600
+@@ -5407,7 +5407,7 @@
+ 	# Find the relevant object directory and library name.
+ 	if test "X$installed" = Xyes; then
+ 	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+-	    func_warning "library \`$lib' was moved."
++	    # func_warning "library \`$lib' was moved."
+ 	    dir="$ladir"
+ 	    absdir="$abs_ladir"
+ 	    libdir="$abs_ladir"
+@@ -5938,8 +5938,8 @@
+ 		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ 		  test -z "$libdir" && \
+ 		    func_fatal_error "\`$deplib' is not a valid libtool archive"
+-		  test "$absdir" != "$libdir" && \
+-		    func_warning "\`$deplib' seems to be moved"
++		  # test "$absdir" != "$libdir" && \
++		  #   func_warning "\`$deplib' seems to be moved"
+ 
+ 		  path="-L$absdir"
  		fi
- 		depdepl=