summaryrefslogtreecommitdiffstats
path: root/network
diff options
context:
space:
mode:
author B. Watson <yalhcru@gmail.com>2022-03-08 00:56:35 -0500
committer Willy Sudiarto Raharjo <willysr@slackbuilds.org>2022-03-09 17:20:41 +0700
commitb004b6ca221ac66252fda37d7eb158a182c6ffd6 (patch)
tree52612ae6261cdcb85e952c3e4969d66784fc4aae /network
parent10bf00519504b4603ad17f9bdb34f87e288faba4 (diff)
downloadslackbuilds-b004b6ca221ac66252fda37d7eb158a182c6ffd6.tar.gz
slackbuilds-b004b6ca221ac66252fda37d7eb158a182c6ffd6.tar.xz
network/libiscsi: Fix conflict with cunit.
Signed-off-by: B. Watson <yalhcru@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'network')
-rw-r--r--network/libiscsi/libiscsi.SlackBuild15
1 files changed, 8 insertions, 7 deletions
diff --git a/network/libiscsi/libiscsi.SlackBuild b/network/libiscsi/libiscsi.SlackBuild
index 462e8886e8..b2346c036c 100644
--- a/network/libiscsi/libiscsi.SlackBuild
+++ b/network/libiscsi/libiscsi.SlackBuild
@@ -46,9 +46,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -83,12 +80,14 @@ cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
+ -o -perm 511 \) -exec chmod 755 {} \+ -o \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
./autogen.sh
+SLKCFLAGS+=" -fcommon"
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -99,6 +98,9 @@ CXXFLAGS="$SLKCFLAGS" \
--mandir=/usr/man \
--docdir=/usr/doc/$PRGNAM-$VERSION \
--disable-static \
+ --disable-tests \
+ --disable-test-tool \
+ --disable-werror \
--build=$ARCH-slackware-linux
make
@@ -107,8 +109,7 @@ make install DESTDIR=$PKG
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+gzip -9 $PKG/usr/man/man*/*
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \