aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/allocators/Hoard/hoard_make.patch13
-rw-r--r--src/allocators/hoard.py9
2 files changed, 5 insertions, 17 deletions
diff --git a/src/allocators/Hoard/hoard_make.patch b/src/allocators/Hoard/hoard_make.patch
deleted file mode 100644
index 100f088..0000000
--- a/src/allocators/Hoard/hoard_make.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/GNUmakefile b/src/GNUmakefile
-index 1f2babf..50e9387 100644
---- a/src/GNUmakefile
-+++ b/src/GNUmakefile
-@@ -3,7 +3,7 @@
-
- CPPFLAGS = -std=c++14 -O3 -DNDEBUG -ffast-math -fno-builtin-malloc -Wall -Wextra -Wshadow -Wconversion -Wuninitialized
- #CPPFLAGS = -std=c++14 -g -O0 -ffast-math -fno-builtin-malloc -Wall -Wextra -Wshadow -Wconversion -Wuninitialized
--CXX = clang++
-+CXX = g++
-
- # Compute platform (OS and architecture) and build accordingly.
-
diff --git a/src/allocators/hoard.py b/src/allocators/hoard.py
index cb2c0e1..b50b097 100644
--- a/src/allocators/hoard.py
+++ b/src/allocators/hoard.py
@@ -1,7 +1,6 @@
import src.allocator
-version = 2.7
sources = src.allocator.Allocator_Sources("Hoard",
retrieve_cmds=["git clone https://github.com/emeryberger/Hoard.git"],
reset_cmds=["git reset --hard"])
@@ -12,9 +11,11 @@ class Hoard (src.allocator.Allocator):
def __init__(self, name, **kwargs):
kwargs["sources"] = sources
- kwargs["LD_PRELOAD"] = "{srcdir}/src/libhoard.so"
- kwargs["build_cmds"] = ["cd {srcdir}/src; make", "mkdir -p {dir}"]
- kwargs["patches"] = ["{patchdir}/hoard_make.patch"]
+ kwargs["LD_PRELOAD"] = "{dir}/libhoard.so"
+ kwargs["build_cmds"] = ["cd {srcdir}/src; make",
+ "mkdir -p {dir}",
+ "ln -f -s {srcdir}/src/libhoard.so {dir}/libhoard.so"]
+ kwargs["requirements"] = ["clang"]
super().__init__(name, **kwargs)