aboutsummaryrefslogtreecommitdiff
path: root/system/vcp
diff options
context:
space:
mode:
authorB. Watson <urchlay@slackware.uk>2022-12-28 22:41:54 -0500
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2022-12-31 09:14:55 +0700
commitde435f3a15fb549abe6be962e324450412f57295 (patch)
tree42997150b621b7df0be9dab68bcd02fad17ff6b4 /system/vcp
parentb409dd37b13ab0829d667335162761d35f08cc41 (diff)
system/vcp: Use -fcommon, tweak slack-desc.
Signed-off-by: B. Watson <urchlay@slackware.uk> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'system/vcp')
-rw-r--r--system/vcp/slack-desc4
-rw-r--r--system/vcp/vcp.SlackBuild9
2 files changed, 9 insertions, 4 deletions
diff --git a/system/vcp/slack-desc b/system/vcp/slack-desc
index 10dbbbf6ac826..ad9f1ad9029a8 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 2f6e82c658f4e..2b28b639559e8 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