diff options
Diffstat (limited to 'system/vcp/vcp.SlackBuild')
-rw-r--r-- | system/vcp/vcp.SlackBuild | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/system/vcp/vcp.SlackBuild b/system/vcp/vcp.SlackBuild index bbcb237b65..2b28b63955 100644 --- a/system/vcp/vcp.SlackBuild +++ b/system/vcp/vcp.SlackBuild @@ -2,15 +2,20 @@ # Slackware build script for vcp -# Written by B. Watson (yalhcru@gmail.com) +# Written by B. Watson (urchlay@slackware.uk) # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. +# 20221228 bkw: BUILD=2: use -fcommon rather than +# -Wl,--allow-multiple-definitions. It probably doesn't matter, +# but -fcommon is more standard (and easier to grep for). +# Also tweak the slack-desc slightly. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=vcp VERSION=${VERSION:-2.2} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -22,9 +27,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 @@ -57,13 +59,10 @@ rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz 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 \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ -make CFLAGS="$SLKCFLAGS" +make CFLAGS="$SLKCFLAGS -fcommon" # "make install" is a mess, do it ourselves: mkdir -p $PKG/usr/bin $PKG/etc $PKG/usr/man/man1 $PKG/usr/man/pl/man1 |