summaryrefslogtreecommitdiff
path: root/source/n
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2020-01-24 00:51:23 +0000
committerEric Hameleers <alien@slackware.com>2020-01-24 08:59:45 +0100
commit0b8ac7e37d08edef43dbf5496d7f2bcfa17e2280 (patch)
treed4337c03adca55ae58927add6e6969f9bae12c05 /source/n
parent4f9273afa49a94b04bccc088fb87fec9d80a3fc6 (diff)
downloadcurrent-0b8ac7e37d08edef43dbf5496d7f2bcfa17e2280.tar.gz
Fri Jan 24 00:51:23 UTC 202020200124005123
a/kernel-generic-5.4.14-x86_64-1.txz: Upgraded. a/kernel-huge-5.4.14-x86_64-1.txz: Upgraded. a/kernel-modules-5.4.14-x86_64-1.txz: Upgraded. ap/sqlite-3.31.0-x86_64-1.txz: Upgraded. d/kernel-headers-5.4.14-x86-1.txz: Upgraded. k/kernel-source-5.4.14-noarch-1.txz: Upgraded. n/libtirpc-1.2.5-x86_64-2.txz: Rebuilt. Recompiled against krb5-1.17.1 (--enable-gssapi). n/nfs-utils-2.4.2-x86_64-2.txz: Rebuilt. Recompiled against krb5-1.17.1 (--enable-gss=yes --enable-svcgss=yes --enable-nfsv4=yes). NFSv4 support in rc.nfsd still pending. n/whois-5.5.5-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/n')
-rwxr-xr-xsource/n/libtirpc/libtirpc.SlackBuild4
-rwxr-xr-xsource/n/nfs-utils/nfs-utils.SlackBuild30
2 files changed, 23 insertions, 11 deletions
diff --git a/source/n/libtirpc/libtirpc.SlackBuild b/source/n/libtirpc/libtirpc.SlackBuild
index b870f008..609cb74d 100755
--- a/source/n/libtirpc/libtirpc.SlackBuild
+++ b/source/n/libtirpc/libtirpc.SlackBuild
@@ -30,11 +30,11 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=libtirpc
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# To build with GSS support (requires Kerberos 5 libraries), pass any value
# other than "NO" in the environment, or edit the line below:
-WITH_GSS=${WITH_GSS:-NO}
+WITH_GSS=${WITH_GSS:-YES}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/n/nfs-utils/nfs-utils.SlackBuild b/source/n/nfs-utils/nfs-utils.SlackBuild
index 7d6b10db..123856a2 100755
--- a/source/n/nfs-utils/nfs-utils.SlackBuild
+++ b/source/n/nfs-utils/nfs-utils.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2008, 2009, 2010, 2011, 2013, 2016, 2018 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2013, 2016, 2018, 2020 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=nfs-utils
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -48,12 +48,22 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
if [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "s390" ]; then
SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "armv7hl" ]; then
+ SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16"
+ LIBDIRSUFFIX=""
else
SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
TMP=${TMP:-/tmp}
@@ -92,16 +102,18 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
-# No NFSv4 yet -- it requires additional libraries.
-
+# Configure, build, and install:
CFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
--mandir=/usr/man \
--with-statedir=/var/lib/nfs \
+ --disable-static \
--enable-mountconfig \
- --enable-nfsv4=no \
- --enable-gss=no \
+ --enable-nfsv4=yes \
+ --enable-gss=yes \
+ --enable-svcgss=yes \
--enable-tirpc=yes \
--program-prefix= \
--program-suffix= \
@@ -110,6 +122,9 @@ CFLAGS="$SLKCFLAGS" \
make $NUMJOBS || make || exit 1
make install DESTDIR=$PKG || exit 1
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
# Add nfsmount.conf and man page:
cat ./utils/mount/nfsmount.conf > $PKG/etc/nfsmount.conf.new
mkdir -p $PKG/usr/man/man5
@@ -125,9 +140,6 @@ sed -i "s/# Defaultvers=4/Defaultvers=3/g" $PKG/etc/nfsmount.conf.new
done
)
-# No NFSv4 yet, so remove these:
-rm -f $PKG/sbin/*nfs4
-
# This should move to support /usr on NFS:
mkdir -p $PKG/sbin
mv $PKG/usr/sbin/rpc.statd $PKG/sbin