summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/heirloom-doctools/heirloom-doctools.SlackBuild22
-rw-r--r--system/heirloom-doctools/heirloom-doctools.info8
-rw-r--r--system/heirloom-doctools/patches/mk.config.patch-191015 (renamed from system/heirloom-doctools/patches/mk.config.patch-160308)0
3 files changed, 22 insertions, 8 deletions
diff --git a/system/heirloom-doctools/heirloom-doctools.SlackBuild b/system/heirloom-doctools/heirloom-doctools.SlackBuild
index 4a07552240..ede6da59c2 100644
--- a/system/heirloom-doctools/heirloom-doctools.SlackBuild
+++ b/system/heirloom-doctools/heirloom-doctools.SlackBuild
@@ -25,7 +25,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=heirloom-doctools
-VERSION=${VERSION:-160308}
+VERSION=${VERSION:-191015}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -70,7 +70,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-${VERSION}.tar.gz
+tar xvf $CWD/$PRGNAM-${VERSION}.tar.bz2
cd $PRGNAM-$VERSION
chown -R root:root .
@@ -82,8 +82,22 @@ find -L . \
patch < $CWD/patches/mk.config.patch-$VERSION
-make
-make install ROOT=$PKG
+# with new bison this doesn't work anymore so we need berkeley yacc
+# also with newer gcc we need -fcommon as tryglf is defined multiple
+# times.
+SLKCFLAGS="$SLKCFLAGS -fcommon"
+
+YACC=/usr/bin/byacc \
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure
+
+# we still need to build with -j1
+YACC=/usr/bin/byacc \
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+make -j1
+make -j1 install ROOT=$PKG
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/system/heirloom-doctools/heirloom-doctools.info b/system/heirloom-doctools/heirloom-doctools.info
index 58f132757d..135de49a91 100644
--- a/system/heirloom-doctools/heirloom-doctools.info
+++ b/system/heirloom-doctools/heirloom-doctools.info
@@ -1,10 +1,10 @@
PRGNAM="heirloom-doctools"
-VERSION="160308"
+VERSION="191015"
HOMEPAGE="http://n-t-roff.github.io/heirloom/doctools.html"
-DOWNLOAD="https://github.com/n-t-roff/heirloom-doctools/archive/160308/heirloom-doctools-160308.tar.gz"
-MD5SUM="f9759a099fca6b3021da33b94b1f37a9"
+DOWNLOAD="https://github.com/n-t-roff/heirloom-doctools/releases/download/191015/heirloom-doctools-191015.tar.bz2"
+MD5SUM="fd32287f39d4e8ceae4783527742ea52"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="byacc"
MAINTAINER="Ruben Schuller"
EMAIL="sb@rbn.im"
diff --git a/system/heirloom-doctools/patches/mk.config.patch-160308 b/system/heirloom-doctools/patches/mk.config.patch-191015
index 493eef5be7..493eef5be7 100644
--- a/system/heirloom-doctools/patches/mk.config.patch-160308
+++ b/system/heirloom-doctools/patches/mk.config.patch-191015