diff options
| author |   B. Watson | 2022-02-07 18:24:28 +0100 |
|---|---|---|
| committer |   Willy Sudiarto Raharjo | 2022-02-09 03:35:13 +0100 |
| commit | 93b5cbed790f83884ed7bcc1c750733a5bb51686 (patch) | |
| tree | e14beecfec96d50e66ec84d4974690080a179986 /network | |
| parent | 5e9f8b80178981539226775db90a25bfe17a2381 (diff) | |
| download | slackbuilds-93b5cbed790f83884ed7bcc1c750733a5bb51686.tar.gz | |
network/ncp: Fix for recent libowfat.
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/ncp/ncp.SlackBuild | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/network/ncp/ncp.SlackBuild b/network/ncp/ncp.SlackBuild index 7dc88747cb..3b45b85364 100644 --- a/network/ncp/ncp.SlackBuild +++ b/network/ncp/ncp.SlackBuild @@ -6,11 +6,13 @@ # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. +# 20220207 bkw: BUILD=2, libowfat changed its dir structure. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=ncp VERSION=${VERSION:-1.2.4} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -31,13 +33,20 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} +# 20220207 bkw: libowfat doesn't use standard lib or lib64 in its dir, +# which is annoying. +L=/opt/diet/lib-i386 + if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" elif [ "$ARCH" = "x86_64" ]; then + L=/opt/diet/lib-x86_64 SLKCFLAGS="-O2 -fPIC" else + # this will fail, would someone who uses arm or aarch64 please add + # them here? SLKCFLAGS="-O2" fi @@ -56,7 +65,8 @@ chmod 644 * sed -i 's,ln -f,ln -s,' GNUmakefile # The libowfat detection stuff needs a little help... -make PREFIX=/usr CFLAGS="$SLKCFLAGS -Wl,-s -I/opt/diet/include/libowfat" + +make PREFIX=/usr CFLAGS="$SLKCFLAGS -Wl,-s -I/opt/diet/include/libowfat -L$L" make install PREFIX=$PKG/usr gzip $PKG/usr/man/man1/*.1 ln -s npush.1.gz $PKG/usr/man/man1/npoll.1.gz |