3 files changed, 24 insertions, 40 deletions
diff --git a/libraries/libhoard/gnuwrapper.cpp.patch b/libraries/libhoard/gnuwrapper.cpp.patch
deleted file mode 100644
index f5b733805cb9c..0000000000000
--- a/libraries/libhoard/gnuwrapper.cpp.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 96378f7975ffae9d8b789daf14daf4bdc937195a Mon Sep 17 00:00:00 2001
-From: "William J. Bowman" <wjb@williamjbowman.com>
-Date: Thu, 26 Jul 2012 12:37:55 -0400
-Subject: [PATCH] Edit to fix declaration mismatch.
-
----
- heaplayers/wrappers/gnuwrapper.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/heaplayers/wrappers/gnuwrapper.cpp b/heaplayers/wrappers/gnuwrapper.cpp
-index f1c4aee..1fff480 100644
---- a/heaplayers/wrappers/gnuwrapper.cpp
-+++ b/heaplayers/wrappers/gnuwrapper.cpp
-@@ -65,7 +65,7 @@ extern "C" {
-   static void * (*old_realloc_hook)(void *ptr, size_t size, const void *caller);
-   static void * (*old_memalign_hook)(size_t alignment, size_t size, const void *caller);
- 
--  void (* __malloc_initialize_hook) (void) = my_init_hook;
-+  void (* volatile  __malloc_initialize_hook) (void) = my_init_hook;
- 
-   static void my_init_hook (void) {
-     // Store the old hooks.
--- 
-1.7.11.3
-
diff --git a/libraries/libhoard/libhoard.SlackBuild b/libraries/libhoard/libhoard.SlackBuild
index a9fbec11b07b6..1f56b57a072a0 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
diff --git a/libraries/libhoard/libhoard.info b/libraries/libhoard/libhoard.info
index 9031db71f7e9a..393b9aa740651 100644
--- a/libraries/libhoard/libhoard.info
+++ b/libraries/libhoard/libhoard.info
@@ -1,8 +1,10 @@
 PRGNAM="libhoard"
-VERSION="3.10"
-HOMEPAGE="http://www.hoard.org/"
-DOWNLOAD="https://github.com/emeryberger/Hoard/releases/download/3.10/Hoard-3.10-source.tar.gz"
-MD5SUM="b9376c1018c0a582c96858ffb3d01a69"
+VERSION="3.12"
+HOMEPAGE="http://hoard.org/"
+DOWNLOAD="https://github.com/emeryberger/Hoard/archive/3.12/libhoard-3.12.tar.gz \
+          https://github.com/emeryberger/Heap-Layers/archive/85c0fb1ea3f6073fed579afe31da1e047d3c3a89/Heap-Layers-85c0fb1ea3f6073fed579afe31da1e047d3c3a89.tar.gz"
+MD5SUM="f4ade479bbc1585388dad2b8d98ab4d7 \
+        dd44790eef0d765dce30443595665d43"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""