diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2016-06-30 20:26:57 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-05-31 23:31:18 +0200 |
commit | d31c50870d0bee042ce660e445c9294a59a3a65b (patch) | |
tree | 6bfc0de3c95267b401b620c2c67859557dc60f97 /source/d/libtool | |
parent | 76fc4757ac91ac7947a01fb7b53dddf9a78a01d1 (diff) | |
download | current-d31c50870d0bee042ce660e445c9294a59a3a65b.tar.gz |
Slackware 14.2slackware-14.2
Thu Jun 30 20:26:57 UTC 2016
Slackware 14.2 x86_64 stable is released!
The long development cycle (the Linux community has lately been living in
"interesting times", as they say) is finally behind us, and we're proud to
announce the release of Slackware 14.2. The new release brings many updates
and modern tools, has switched from udev to eudev (no systemd), and adds
well over a hundred new packages to the system. Thanks to the team, the
upstream developers, the dedicated Slackware community, and everyone else
who pitched in to help make this release a reality.
The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided
32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware
project by picking up a copy from store.slackware.com. We're taking
pre-orders now, and offer a discount if you sign up for a subscription.
Have fun! :-)
Diffstat (limited to 'source/d/libtool')
-rwxr-xr-x | source/d/libtool/libtool.SlackBuild | 10 | ||||
-rw-r--r-- | source/d/libtool/libtool.no.moved.warning.diff | 66 |
2 files changed, 37 insertions, 39 deletions
diff --git a/source/d/libtool/libtool.SlackBuild b/source/d/libtool/libtool.SlackBuild index ffa0bc4b..44810932 100755 --- a/source/d/libtool/libtool.SlackBuild +++ b/source/d/libtool/libtool.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2013 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2013, 2015 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,14 +21,14 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. VERSION=${VERSION:-$(echo libtool-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-4} NUMJOBS=${NUMJOBS:--j6} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -39,8 +39,8 @@ CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-libtool -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" diff --git a/source/d/libtool/libtool.no.moved.warning.diff b/source/d/libtool/libtool.no.moved.warning.diff index 80077516..783c97af 100644 --- a/source/d/libtool/libtool.no.moved.warning.diff +++ b/source/d/libtool/libtool.no.moved.warning.diff @@ -1,44 +1,42 @@ ---- ./libltdl/config/ltmain.m4sh.orig 2010-09-22 09:45:18.000000000 -0500 -+++ ./libltdl/config/ltmain.m4sh 2010-11-06 13:38:09.000000000 -0500 -@@ -5710,7 +5710,7 @@ +diff -Nur libtool-2.4.3.orig/build-aux/ltmain.in libtool-2.4.3/build-aux/ltmain.in +--- libtool-2.4.3.orig/build-aux/ltmain.in 2014-10-27 12:20:51.000000000 -0500 ++++ libtool-2.4.3/build-aux/ltmain.in 2014-10-28 11:01:00.731257807 -0500 +@@ -5978,7 +5978,7 @@ # Find the relevant object directory and library name. - if test "X$installed" = Xyes; then + if test yes = "$installed"; then if test ! -f "$lt_sysroot$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" -@@ -6277,8 +6277,8 @@ - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` +- func_warning "library '$lib' was moved." ++ #func_warning "library '$lib' was moved." + dir=$ladir + absdir=$abs_ladir + libdir=$abs_ladir +@@ -6546,7 +6546,7 @@ 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" + func_fatal_error "'$deplib' is not a valid libtool archive" + test "$absdir" != "$libdir" && \ +- func_warning "'$deplib' seems to be moved" ++ #func_warning "'$deplib' seems to be moved" - path="-L$absdir" + path=-L$absdir fi ---- ./libltdl/config/ltmain.sh.orig 2010-09-22 09:45:43.000000000 -0500 -+++ ./libltdl/config/ltmain.sh 2010-11-06 13:38:49.000000000 -0500 -@@ -6499,7 +6499,7 @@ +diff -Nur libtool-2.4.3.orig/build-aux/ltmain.sh libtool-2.4.3/build-aux/ltmain.sh +--- libtool-2.4.3.orig/build-aux/ltmain.sh 2014-10-27 13:04:31.000000000 -0500 ++++ libtool-2.4.3/build-aux/ltmain.sh 2014-10-28 11:01:14.196484821 -0500 +@@ -7890,7 +7890,7 @@ # Find the relevant object directory and library name. - if test "X$installed" = Xyes; then + if test yes = "$installed"; then if test ! -f "$lt_sysroot$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" -@@ -7066,8 +7066,8 @@ - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` +- func_warning "library '$lib' was moved." ++ #func_warning "library '$lib' was moved." + dir=$ladir + absdir=$abs_ladir + libdir=$abs_ladir +@@ -8458,7 +8458,7 @@ 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" + func_fatal_error "'$deplib' is not a valid libtool archive" + test "$absdir" != "$libdir" && \ +- func_warning "'$deplib' seems to be moved" ++ #func_warning "'$deplib' seems to be moved" - path="-L$absdir" + path=-L$absdir fi |