1 files changed, 18 insertions, 11 deletions
diff --git a/libraries/libhoard/libhoard.SlackBuild b/libraries/libhoard/libhoard.SlackBuild
index a9fbec11b0..1f56b57a07 100644
--- a/libraries/libhoard/libhoard.SlackBuild
+++ b/libraries/libhoard/libhoard.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libhoard
 
-# Copyright 2012 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2012-2018 Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libhoard
-VERSION=${VERSION:-3.10}
+VERSION=${VERSION:-3.12}
+HEAP_LAYERS_VERSION=${HEAP_LAYERS_VERSION:-85c0fb1ea3f6073fed579afe31da1e047d3c3a89}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -51,7 +52,7 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
-  TARGET="x86-64"
+  TARGET="x86_64"
 fi
 
 set -e
@@ -59,9 +60,13 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf Hoard
-tar xvf $CWD/Hoard-$VERSION-source.tar.gz
-cd Hoard
+rm -rf Hoard-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd Hoard-$VERSION/src/
+rm -rf Heap-Layers
+tar xvf $CWD/Heap-Layers-$HEAP_LAYERS_VERSION.tar.gz
+mv Heap-Layers-$HEAP_LAYERS_VERSION Heap-Layers
+cd $TMP/Hoard-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -70,17 +75,19 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # sanify CFLAGS
-sed -i "s/ -march=pentium4//g" src/Makefile
-sed -i "s/ -march=nocona//g" src/Makefile
-sed -i "s/-O3/$SLKCFLAGS/g" src/Makefile
+sed -i "s/-O3/$SLKCFLAGS/g" src/GNUmakefile
 
 cd src
-  make linux-gcc-$TARGET
+  gmake Linux-gcc-$TARGET
 
   mkdir -p $PKG/usr/lib$LIBDIRSUFFIX
-  install -m 755 libhoard.so $PKG/usr/lib$LIBDIRSUFFIX
+
+  gmake Linux-gcc-$TARGET-install PREFIX=$PKG/usr/lib$LIBDIRSUFFIX
 cd -
 
+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
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING NEWS README.md THANKS doc \
   $PKG/usr/doc/$PRGNAM-$VERSION