diff options
| author | Patrick J Volkerding <volkerdi@slackware.com> | 2010-05-19 08:58:23 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2018-05-31 22:43:05 +0200 |
| commit | b76270bf9e6dd375e495fec92140a79a79415d27 (patch) | |
| tree | 3dbed78b2279bf9f14207a16dc634b90995cbd40 /source/a/e2fsprogs | |
| parent | 5a12e7c134274dba706667107d10d231517d3e05 (diff) | |
| download | current-b76270bf9e6dd375e495fec92140a79a79415d27.tar.gz | |
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!
Diffstat (limited to 'source/a/e2fsprogs')
| -rwxr-xr-x | source/a/e2fsprogs/e2fsprogs.SlackBuild | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/source/a/e2fsprogs/e2fsprogs.SlackBuild b/source/a/e2fsprogs/e2fsprogs.SlackBuild index c57cea4f..c79c29eb 100755 --- a/source/a/e2fsprogs/e2fsprogs.SlackBuild +++ b/source/a/e2fsprogs/e2fsprogs.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,11 +20,21 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=${VERSION:-1.41.8} -ARCH=${ARCH:-x86_64} -NUMJOBS=${NUMJOBS:-" -j7 "} +VERSION=${VERSION:-$(echo e2fsprogs*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} BUILD=${BUILD:-1} +NUMJOBS=${NUMJOBS:-" -j7 "} + +# 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 + if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -34,6 +44,9 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi CWD=$(pwd) @@ -53,11 +66,7 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Disable --uuidd builds the same functionality into libuuid.*. -# It's better that way. -# Keep the included libblkid and libuuid for now, but we'll be using the -# system-wide one from util-linux-ng sooner or later... -# fsck.* will also be moving to u-l-ng +# Disable libblkid and libuuid, as we'll be using the ones in u-l-ng CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix= \ @@ -69,8 +78,8 @@ CFLAGS="$SLKCFLAGS" \ --infodir=/usr/info \ --docdir=/usr/doc/e2fsprogs-$VERSION \ --enable-elf-shlibs \ - --enable-libblkid \ - --enable-libuuid \ + --disable-libblkid \ + --disable-libuuid \ --disable-uuidd \ --build=$ARCH-slackware-linux @@ -99,6 +108,7 @@ mv $PKG/lib${LIBDIRSUFFIX}/pkgconfig $PKG/lib${LIBDIRSUFFIX}/*.so \ ln -sf /lib${LIBDIRSUFFIX}/$(readlink $i) $i ; done ) +# findfs is intentionally left out here - we use the one in util-linux-ng ( cd $PKG/sbin rm -f \ mkfs.ext2 mkfs.ext3 mkfs.ext4 mkfs.ext4dev \ @@ -108,7 +118,6 @@ mv $PKG/lib${LIBDIRSUFFIX}/pkgconfig $PKG/lib${LIBDIRSUFFIX}/*.so \ ln -sf mke2fs mkfs.ext4 ln -sf mke2fs mkfs.ext4dev ln -sf tune2fs e2label - ln -sf tune2fs findfs cat << EOF > fsck.ext2 #!/bin/sh exec /sbin/e2fsck -C 0 \$* |