summaryrefslogtreecommitdiffstats
path: root/system/csh
diff options
context:
space:
mode:
author B. Watson <yalhcru@gmail.com>2017-06-21 00:10:42 -0400
committer Willy Sudiarto Raharjo <willysr@slackbuilds.org>2017-06-24 08:32:48 +0700
commit064014d18ee7dbb63a822f2758df32d08f21fd0a (patch)
treeb400e3da128c1626c0c50d5855659c04b8c2c04b /system/csh
parentba72e39924b18e60748837b08a99ce0c1ba1a57a (diff)
downloadslackbuilds-064014d18ee7dbb63a822f2758df32d08f21fd0a.tar.gz
slackbuilds-064014d18ee7dbb63a822f2758df32d08f21fd0a.tar.xz
system/csh: Fix build for -current.
Signed-off-by: B. Watson <yalhcru@gmail.com>
Diffstat (limited to 'system/csh')
-rw-r--r--system/csh/csh.SlackBuild15
-rw-r--r--system/csh/csh.info4
2 files changed, 13 insertions, 6 deletions
diff --git a/system/csh/csh.SlackBuild b/system/csh/csh.SlackBuild
index 31835c2beb6..2adb56deea4 100644
--- a/system/csh/csh.SlackBuild
+++ b/system/csh/csh.SlackBuild
@@ -6,9 +6,14 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20170621 bkw:
+# - update to latest debian patch (-2.2, needed for -current).
+# - quit compiling with -Werror (also needed for -current).
+# - BUILD=2.
+
PRGNAM=csh
VERSION=${VERSION:-20110502}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -40,6 +45,8 @@ fi
set -e
+DEBVER=2.2
+
# Grr.
TARNAM="${PRGNAM}_${VERSION}.orig"
DIRNAM="${PRGNAM}-${VERSION}.orig"
@@ -50,7 +57,7 @@ cd $TMP
rm -rf $DIRNAM
tar xvf $CWD/$TARNAM.tar.gz
cd $DIRNAM
-tar xvf $CWD/${PRGNAM}_${VERSION}-2.debian.tar.gz
+tar xvf $CWD/${PRGNAM}_${VERSION}-$DEBVER.debian.tar.[xg]z
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -75,8 +82,8 @@ sed -i "1iCFLAGS=$SLKCFLAGS" Makefile
# /usr/lib/libc.a hard-coded, and pmake wants to build that (and can't),
# even though the csh binary is dynamic and doesn't even need libc.a!
# Also don't know why I have to make const.h separately, but it works.
-pmake const.h
-pmake LIBC=/usr/lib$LIBDIRSUFFIX/libc.a
+pmake const.h NOGCCERROR=1
+pmake LIBC=/usr/lib$LIBDIRSUFFIX/libc.a NOGCCERROR=1
cd USD.doc
pmake paper.ps paper.txt
cd -
diff --git a/system/csh/csh.info b/system/csh/csh.info
index e6382ca1a4b..a8ac38100af 100644
--- a/system/csh/csh.info
+++ b/system/csh/csh.info
@@ -2,9 +2,9 @@ PRGNAM="csh"
VERSION="20110502"
HOMEPAGE="https://packages.debian.org/sid/csh"
DOWNLOAD="http://ftp.debian.org/debian/pool/main/c/csh/csh_20110502.orig.tar.gz \
- http://ftp.debian.org/debian/pool/main/c/csh/csh_20110502-2.debian.tar.gz"
+ http://http.debian.net/debian/pool/main/c/csh/csh_20110502-2.2.debian.tar.xz"
MD5SUM="578c40bfa54c09c8affbc434e34fb40c \
- d38e605854996cd5ce5217eed665ca19"
+ a66e38ff89e978970a4ade6eb419a69a"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="%README% libbsd"