aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schäfer <gentryx@gmx.de>2014-02-19 00:53:14 +0100
committerAndreas Schäfer <gentryx@gmx.de>2014-02-19 00:53:14 +0100
commit07af85a43a3b677e6fef933d9b58892296757987 (patch)
tree8568bf5e7fdcc525625343ee4796b2b2dcc890e0 /sys-apps/likwid/files
parentrefactored setting of threads use flag for VisIt (diff)
downloadsci-07af85a43a3b677e6fef933d9b58892296757987.tar.gz
sci-07af85a43a3b677e6fef933d9b58892296757987.tar.bz2
sci-07af85a43a3b677e6fef933d9b58892296757987.zip
added ebuild/patches for likwid-3.1.1
Diffstat (limited to 'sys-apps/likwid/files')
-rw-r--r--sys-apps/likwid/files/likwid-3.1.1-paths.patch27
-rw-r--r--sys-apps/likwid/files/likwid-3.1.1-shared_lib.patch12
2 files changed, 39 insertions, 0 deletions
diff --git a/sys-apps/likwid/files/likwid-3.1.1-paths.patch b/sys-apps/likwid/files/likwid-3.1.1-paths.patch
new file mode 100644
index 000000000..202970e01
--- /dev/null
+++ b/sys-apps/likwid/files/likwid-3.1.1-paths.patch
@@ -0,0 +1,27 @@
+diff -ru likwid-3.1.1/config.mk likwid-3.1.1-nju/config.mk
+--- likwid-3.1.1/config.mk 2014-02-12 17:14:16.000000000 +0100
++++ likwid-3.1.1-nju/config.mk 2014-02-19 00:22:02.530917183 +0100
+@@ -10,12 +10,12 @@
+
+ # Path were to install likwid
+ PREFIX = /usr/local#NO SPACE
+-MANPREFIX = $(PREFIX)/man#NO SPACE
++MANPREFIX = $(PREFIX)/share/man#NO SPACE
+
+ # For the daemon based secure msr/pci access configure
+ # the absolute path to the msr daemon executable.
+ # $(PREFIX)/bin/likwid-accessD
+-ACCESSDAEMON = $(PREFIX)/bin/likwid-accessD#NO SPACE
++ACCESSDAEMON = /usr/bin/likwid-accessD#NO SPACE
+
+ # Build the accessDaemon. Have a look in the WIKI for details.
+ BUILDDAEMON = true#NO SPACE
+@@ -26,7 +26,7 @@
+ ACCESSMODE = accessdaemon#NO SPACE
+
+ # Change to true to a build shared library instead of a static one
+-SHARED_LIBRARY = false#NO SPACE
++SHARED_LIBRARY = true#NO SPACE
+
+ # Build Fortran90 module interface for marker API. Adopt Fortran compiler
+ # in ./make/include_<COMPILER>.mk if necessary. Default: ifort .
diff --git a/sys-apps/likwid/files/likwid-3.1.1-shared_lib.patch b/sys-apps/likwid/files/likwid-3.1.1-shared_lib.patch
new file mode 100644
index 000000000..6499fa221
--- /dev/null
+++ b/sys-apps/likwid/files/likwid-3.1.1-shared_lib.patch
@@ -0,0 +1,12 @@
+diff -ru likwid-3.1.1-nju/Makefile likwid-3.1.1-njv/Makefile
+--- likwid-3.1.1-nju/Makefile 2014-02-19 00:20:55.620918453 +0100
++++ likwid-3.1.1-njv/Makefile 2014-02-19 00:47:28.250888224 +0100
+@@ -184,7 +184,7 @@
+
+ $(APPS): $(addprefix $(SRC_DIR)/applications/,$(addsuffix .c,$(APPS))) $(BUILD_DIR) $(GENGROUPLOCK) $(OBJ) $(OBJ_BENCH)
+ @echo "===> LINKING $@"
+- $(Q)${CC} $(CFLAGS) $(ANSI_CFLAGS) $(CPPFLAGS) ${LFLAGS} -o $@ $(addprefix $(SRC_DIR)/applications/,$(addsuffix .c,$@)) $(OBJ_BENCH) $(STATIC_TARGET_LIB) $(LIBS)
++ $(Q)${CC} $(CFLAGS) $(ANSI_CFLAGS) $(CPPFLAGS) ${LFLAGS} -o $@ $(addprefix $(SRC_DIR)/applications/,$(addsuffix .c,$@)) $(OBJ_BENCH) $(STATIC_TARGET_LIB) $(DYNAMIC_TARGET_LIB) $(LIBS)
+
+ $(STATIC_TARGET_LIB): $(OBJ)
+ @echo "===> CREATE STATIC LIB $(STATIC_TARGET_LIB)"