diff options
| -rw-r--r-- | system/vcp/slack-desc | 4 | ||||
| -rw-r--r-- | system/vcp/vcp.SlackBuild | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/system/vcp/slack-desc b/system/vcp/slack-desc index 10dbbbf6ac..ad9f1ad902 100644 --- a/system/vcp/slack-desc +++ b/system/vcp/slack-desc @@ -9,8 +9,8 @@ vcp: vcp (copy files via a curses interface) vcp: vcp: vcp copies files and directories in a curses interface, with text -vcp: only output available. its options and output are similar to BSD's -vcp: cp while adding some new features. It provides information on: +vcp: only output available. Its options and output are similar to BSD's +vcp: cp while adding some new features. It provides information on: vcp: vcp: - files copied and left to copy vcp: - data written and total data size diff --git a/system/vcp/vcp.SlackBuild b/system/vcp/vcp.SlackBuild index 2f6e82c658..2b28b63955 100644 --- a/system/vcp/vcp.SlackBuild +++ b/system/vcp/vcp.SlackBuild @@ -6,11 +6,16 @@ # 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} @@ -57,7 +62,7 @@ chown -R root:root . find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ -make CFLAGS="$SLKCFLAGS -Wl,--allow-multiple-definition" +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 |