summaryrefslogtreecommitdiff
path: root/source/a/util-linux-ng/util-linux-ng.SlackBuild
diff options
context:
space:
mode:
Diffstat (limited to 'source/a/util-linux-ng/util-linux-ng.SlackBuild')
-rwxr-xr-xsource/a/util-linux-ng/util-linux-ng.SlackBuild52
1 files changed, 39 insertions, 13 deletions
diff --git a/source/a/util-linux-ng/util-linux-ng.SlackBuild b/source/a/util-linux-ng/util-linux-ng.SlackBuild
index 2c2ea55e..386487ab 100755
--- a/source/a/util-linux-ng/util-linux-ng.SlackBuild
+++ b/source/a/util-linux-ng/util-linux-ng.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
@@ -22,14 +22,23 @@
# Slackware build script for util-linux-ng
-VERSION=${VERSION:-2.14.2}
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-$(echo util-linux-ng*.tar.?z* | cut -d - -f 4 | rev | cut -f 3- -d . | rev)}
+BUILD=${BUILD:-1}
ADJTIMEXVERS=1.23
SETSERIALVERS=2.17
ZIPTOOLVERS=1.4.0
+# 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=""
@@ -39,17 +48,20 @@ elif [ "$ARCH" = "s390" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-util-linux-ng
+
rm -rf $PKG
mkdir -p $TMP $PKG
-
cd $TMP || exit 1
rm -rf util-linux-ng-$VERSION
-tar xvf $CWD/util-linux-ng-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/util-linux-ng-$VERSION.tar.xz || exit 1
cd util-linux-ng-$VERSION || exit 1
chown -R root.root .
find . \
@@ -84,6 +96,7 @@ CFLAGS="$SLKCFLAGS" \
--mandir=/usr/man \
--infodir=/usr/info \
--docdir=/usr/doc/util-linux-ng-$VERSION \
+ --disable-static \
--enable-arch \
--enable-agetty \
--disable-init \
@@ -99,12 +112,24 @@ CFLAGS="$SLKCFLAGS" \
--enable-wall \
--enable-write \
--enable-use-tty-group \
+ --enable-libblkid \
+ --enable-libuuid \
+ --disable-uuidd \
--build=$ARCH-slackware-linux \
- --host=$ARCH-slackware-linux \
|| exit 1
make || exit 1
-make install DESTDIR=$PKG
+make install DESTDIR=$PKG || make install DESTDIR=$PKG
+
+# Move the libblkid and libuuid libraries to /lib${LIBSUFFIX}
+mkdir -p $PKG/lib${LIBDIRSUFFIX}
+( cd $PKG/usr/lib${LIBDIRSUFFIX}
+ mv libblkid.so.1* $PKG/lib${LIBDIRSUFFIX}
+ mv libuuid.so.1* $PKG/lib${LIBDIRSUFFIX}
+ rm -f libblkid.so libuuid.so
+ ln -sf /lib${LIBDIRSUFFIX}/libblkid.so.1 libblkid.so
+ ln -sf /lib${LIBDIRSUFFIX}/libuuid.so.1 libuuid.so
+)
# Moving things around that have been in the same place
# for 15 years is, IMHO, not a wise idea AT ALL.
@@ -124,12 +149,11 @@ fi
cat ./sys-utils/rdev > $PKG/sbin/rdev
chown root:root $PKG/sbin/rdev
chmod 755 $PKG/sbin/rdev
-#cat ./sys-utils/rdev.8 | gzip -9c > $PKG/usr/man/man8/rdev.8.gz
# Build ziptool
cd $TMP || exit 1
rm -rf ziptool-$ZIPTOOLVERS
-tar xvf $CWD/ziptool-$ZIPTOOLVERS.tar.bz2 || exit 1
+tar xvf $CWD/ziptool-$ZIPTOOLVERS.tar.xz || exit 1
cd ziptool-$ZIPTOOLVERS || exit 1
zcat $CWD/ziptool-fix_build.patch.gz | patch -p1 || exit 1
mkdir scsi
@@ -159,7 +183,7 @@ cat strings.1 | gzip -9c > $PKG/usr/man/man1/strings.1.gz
# installing just the A series will not have a hostname (null):
cd $TMP || exit 1
rm -rf net-tools-1.60
-tar xvf $CWD/net-tools-1.60.tar.bz2
+tar xvf $CWD/net-tools-1.60.tar.xz
cd net-tools-1.60
zcat $CWD/net-tools_1.60-19.diff.gz | patch -p1 || exit
zcat $CWD/net-tools.diff.gz | patch -p1 || exit
@@ -205,8 +229,9 @@ tar xvf $CWD/setserial-$SETSERIALVERS.tar.gz || exit 1
cd setserial-$SETSERIALVERS || exit 1
chown -R root:root .
zcat $CWD/setserial-rc.serial.diff.gz | patch -E -p1 --verbose || exit 1
+zcat $CWD/setserial-undef_TIOCGHAYESESP.diff.gz | patch -E -p1 --verbose || exit 1
# The original config.{guess,sub} do not work on x86_64
-cp -p /usr/share/libtool/config.{guess,sub} .
+cp -p /usr/share/libtool/config/config.{guess,sub} .
./configure --prefix=/usr || exit 1
make || exit 1
strip setserial
@@ -272,7 +297,8 @@ rm $PKG/usr/info/dir
gzip -9 $PKG/usr/info/*
mkdir -p $PKG/usr/doc/util-linux-ng-$VERSION
-cp ABOUT-NLS AUTHORS COPYING DEPRECATED NEWS README* TODO docs/* \
+cp -a AUTHORS COPYING DEPRECATED NEWS README* TODO \
+ docs/v${VERSION}-ReleaseNotes \
$PKG/usr/doc/util-linux-ng-$VERSION
mkdir $PKG/install