summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmy Winston <amynka@gentoo.org>2016-07-19 11:41:48 +0200
committerAmy Winston <amynka@gentoo.org>2016-07-19 11:41:48 +0200
commit773af2b3d89eab8d088f8f597588abf3342b369b (patch)
treed8cad21a77d57d548dc0d53d0792677482b73e5e /sys-apps/likwid/files
parentsys-apps/likwid: version bump 4.1.1 bug #588830. Brendan Horan (diff)
downloadgentoo-773af2b3d89eab8d088f8f597588abf3342b369b.tar.gz
gentoo-773af2b3d89eab8d088f8f597588abf3342b369b.tar.bz2
gentoo-773af2b3d89eab8d088f8f597588abf3342b369b.zip
sys-apps/likwid: remove old. Brendan Horan.
Package-Manager: portage-2.2.28
Diffstat (limited to 'sys-apps/likwid/files')
-rw-r--r--sys-apps/likwid/files/likwid-3.1.3-Makefile.patch42
-rw-r--r--sys-apps/likwid/files/likwid-3.1.3-fix-gnustack.patch32
-rw-r--r--sys-apps/likwid/files/likwid-4.0.1-Makefile.patch39
-rw-r--r--sys-apps/likwid/files/likwid-4.0.1-access-daemon.patch11
-rw-r--r--sys-apps/likwid/files/likwid-4.0.1-config.mk.patch46
-rw-r--r--sys-apps/likwid/files/likwid-4.0.1-fix-gnustack.patch31
-rw-r--r--sys-apps/likwid/files/likwid-4.0.1-lua-makefile.patch19
7 files changed, 0 insertions, 220 deletions
diff --git a/sys-apps/likwid/files/likwid-3.1.3-Makefile.patch b/sys-apps/likwid/files/likwid-3.1.3-Makefile.patch
deleted file mode 100644
index a40d0c3262a2..000000000000
--- a/sys-apps/likwid/files/likwid-3.1.3-Makefile.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- Makefile.org 2015-03-04 16:25:59.942213571 +0800
-+++ Makefile 2015-03-04 16:46:05.640278082 +0800
-@@ -87,7 +87,7 @@
-
- LIKWID_LIB = liblikwid
- ifeq ($(SHARED_LIBRARY),true)
--CFLAGS += $(SHARED_CFLAGS) -ggdb
-+CFLAGS += $(SHARED_CFLAGS) -g -Wa,--noexecstack
- DYNAMIC_TARGET_LIB := $(LIKWID_LIB).so
- TARGET_LIB := $(DYNAMIC_TARGET_LIB)
- LIBS += -L. -llikwid
-@@ -307,28 +307,8 @@
- echo "Only root can adjust the privileges of the daemon applications in $(PREFIX)/sbin"; \
- fi; \
- done
-- @echo "===> INSTALL man pages to $(MANPREFIX)/man1"
-- @mkdir -p $(MANPREFIX)/man1
-- @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-topology.1 > $(MANPREFIX)/man1/likwid-topology.1
-- @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-features.1 > $(MANPREFIX)/man1/likwid-features.1
-- @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-perfctr.1 > $(MANPREFIX)/man1/likwid-perfctr.1
-- @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-powermeter.1 > $(MANPREFIX)/man1/likwid-powermeter.1
-- @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-pin.1 > $(MANPREFIX)/man1/likwid-pin.1
-- @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-setFrequencies.1 > $(MANPREFIX)/man1/likwid-setFrequencies.1
-- @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-bench.1 > $(MANPREFIX)/man1/likwid-bench.1
-- @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/feedGnuplot.1 > $(MANPREFIX)/man1/feedGnuplot.1
-- @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-accessD.1 > $(MANPREFIX)/man1/likwid-accessD.1
-- @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-genCfg.1 > $(MANPREFIX)/man1/likwid-genCfg.1
-- @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-memsweeper.1 > $(MANPREFIX)/man1/likwid-memsweeper.1
-- @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-mpirun.1 > $(MANPREFIX)/man1/likwid-mpirun.1
-- @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-perfscope.1 > $(MANPREFIX)/man1/likwid-perfscope.1
-- @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-setFreq.1 > $(MANPREFIX)/man1/likwid-setFreq.1
-- @chmod 644 $(MANPREFIX)/man1/likwid-*
-- @echo "===> INSTALL headers to $(PREFIX)/include"
-- @mkdir -p $(PREFIX)/include/likwid
-- @cp -f src/includes/likwid*.h $(PREFIX)/include/
-- @cp -f src/includes/* $(PREFIX)/include/likwid
-- @cp -f GCC/perfmon_group_types.h $(PREFIX)/include/likwid
-+ @echo "===> INSTALL man pages"
-+ @mkdir -p $(PREFIX)/include/
- $(FORTRAN_INSTALL)
- @echo "===> INSTALL libraries to $(PREFIX)/lib"
- @mkdir -p $(PREFIX)/lib
diff --git a/sys-apps/likwid/files/likwid-3.1.3-fix-gnustack.patch b/sys-apps/likwid/files/likwid-3.1.3-fix-gnustack.patch
deleted file mode 100644
index 6ee4149dd5d7..000000000000
--- a/sys-apps/likwid/files/likwid-3.1.3-fix-gnustack.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/Makefile b/Makefile
-index eecd4e9..34eee7c 100644
---- a/Makefile
-+++ b/Makefile
-@@ -259,6 +259,7 @@ $(BUILD_DIR)/%.h: $(SRC_DIR)/includes/%.txt
- $(BUILD_DIR)/%.o: $(BUILD_DIR)/%.pas
- @echo "===> ASSEMBLE $@"
- $(Q)$(PAS) -i $(PASFLAGS) -o $(BUILD_DIR)/$*.s $< '$(DEFINES)'
-+ @cat fix_gnustack.txt >> $(BUILD_DIR)/$*.s
- $(Q)$(AS) $(ASFLAGS) $(BUILD_DIR)/$*.s -o $@
-
- ifeq ($(findstring $(MAKECMDGOALS),clean),)
-diff --git a/fix_gnustack.txt b/fix_gnustack.txt
-new file mode 100644
-index 0000000..965af94
---- /dev/null
-+++ b/fix_gnustack.txt
-@@ -0,0 +1,3 @@
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-diff --git a/src/loadData.s b/src/loadData.s
-index e176c53..9934f7d 100644
---- a/src/loadData.s
-+++ b/src/loadData.s
-@@ -20,3 +20,6 @@ ret
- .size _loadData, .-_loadData
-
-
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
diff --git a/sys-apps/likwid/files/likwid-4.0.1-Makefile.patch b/sys-apps/likwid/files/likwid-4.0.1-Makefile.patch
deleted file mode 100644
index 460192216fd6..000000000000
--- a/sys-apps/likwid/files/likwid-4.0.1-Makefile.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- Makefile.org 2015-08-24 10:58:52.694430235 +0800
-+++ Makefile 2015-08-24 10:54:27.114444154 +0800
-@@ -51,7 +51,6 @@
-
- #CONFIGURE BUILD SYSTEM
- BUILD_DIR = ./$(COMPILER)
--Q ?= @
- GENGROUPLOCK = .gengroup
-
- VPATH = $(SRC_DIR)
-@@ -285,21 +284,6 @@
- @cd $(LIBPREFIX) && ln -fs liblikwidpin.so.$(VERSION) liblikwidpin.so
- @cd $(LIBPREFIX) && ln -fs $(shell basename $(TARGET_HWLOC_LIB)).$(VERSION) $(shell basename $(TARGET_HWLOC_LIB))
- @cd $(LIBPREFIX) && ln -fs $(shell basename $(TARGET_LUA_LIB)).$(VERSION) $(shell basename $(TARGET_LUA_LIB))
-- @echo "===> INSTALL man pages to $(MANPREFIX)/man1"
-- @mkdir -p $(MANPREFIX)/man1
-- @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-topology.1 > $(MANPREFIX)/man1/likwid-topology.1
-- @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-features.1 > $(MANPREFIX)/man1/likwid-features.1
-- @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" -e "s+<PREFIX>+$(PREFIX)+g" < $(DOC_DIR)/likwid-perfctr.1 > $(MANPREFIX)/man1/likwid-perfctr.1
-- @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-powermeter.1 > $(MANPREFIX)/man1/likwid-powermeter.1
-- @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-pin.1 > $(MANPREFIX)/man1/likwid-pin.1
-- @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/feedGnuplot.1 > $(MANPREFIX)/man1/feedGnuplot.1
-- @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-accessD.1 > $(MANPREFIX)/man1/likwid-accessD.1
-- @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-genTopoCfg.1 > $(MANPREFIX)/man1/likwid-genTopoCfg.1
-- @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-memsweeper.1 > $(MANPREFIX)/man1/likwid-memsweeper.1
-- @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-mpirun.1 > $(MANPREFIX)/man1/likwid-mpirun.1
-- @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-perfscope.1 > $(MANPREFIX)/man1/likwid-perfscope.1
-- @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-setFreq.1 > $(MANPREFIX)/man1/likwid-setFreq.1
-- @chmod 644 $(MANPREFIX)/man1/likwid-*
- @echo "===> INSTALL headers to $(PREFIX)/include"
- @mkdir -p $(PREFIX)/include
- @install -m 644 src/includes/likwid.h $(PREFIX)/include/
-@@ -363,6 +347,6 @@
- sed -i -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" -e "s/<RELEASE>/$(RELEASE)/g" -e "s+$(PREFIX)/bin/likwid-lua+$(PWD)/ext/lua/lua+" -e "s+$(PREFIX)/share/lua/?.lua+$(PWD)/?.lua+" $$APP; \
- chmod +x $$APP; \
- done
-- @sed -i -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" -e "s/<RELEASE>/$(RELEASE)/g" -e "s+$(PREFIX)/lib+$(PWD)+g" -e "s+$(PREFIX)/share/likwid/perfgroups+$(PWD)/groups+g" likwid.lua;
-+ @sed -i -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" -e "s/<RELEASE>/$(RELEASE)/g" -e "s+$(PREFIX)/+$(PWD)+g" -e "s+$(PREFIX)/share/likwid/perfgroups+$(PWD)/groups+g" likwid.lua;
- @sed -i -e "s+$(PREFIX)/share/likwid/mongroups+$(PWD)/monitoring/groups+g" likwid-agent
diff --git a/sys-apps/likwid/files/likwid-4.0.1-access-daemon.patch b/sys-apps/likwid/files/likwid-4.0.1-access-daemon.patch
deleted file mode 100644
index 2652f246111d..000000000000
--- a/sys-apps/likwid/files/likwid-4.0.1-access-daemon.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/configuration.c.orig 2015-11-14 09:10:58.283075033 +0100
-+++ src/configuration.c 2015-11-14 09:11:14.898074670 +0100
-@@ -68,7 +68,7 @@
- use_hardcoded:
- ret = sprintf(filename,"%s", TOSTRING(ACCESSDAEMON));
- filename[ret] = '\0';
-- if (!access(filename, R_OK))
-+ if (!access(filename, X_OK))
- {
- config.daemonPath = (char*)malloc((strlen(filename)+1) * sizeof(char));
- strcpy(config.daemonPath, filename);
diff --git a/sys-apps/likwid/files/likwid-4.0.1-config.mk.patch b/sys-apps/likwid/files/likwid-4.0.1-config.mk.patch
deleted file mode 100644
index 2ca02bc9b9fa..000000000000
--- a/sys-apps/likwid/files/likwid-4.0.1-config.mk.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- config.mk.org 2015-08-24 19:46:39.354151547 +0800
-+++ config.mk 2015-08-24 19:49:31.040699137 +0800
-@@ -12,15 +12,15 @@
- PREFIX = /usr/local#NO SPACE
- MANPREFIX = $(PREFIX)/man#NO SPACE
- BINPREFIX = $(PREFIX)/bin#NO SPACE
--LIBPREFIX = $(PREFIX)/lib#NO SPACE
-+LIBPREFIX = $(PREFIX)/$(get_libdir)#NO SPACE
-
- # These paths are hardcoded into executables and libraries. Usually
- # they'll be the same as above, but package maintainers may want to
- # distinguish between the image directories and the final install
- # target.
--INSTALLED_PREFIX=$(PREFIX)
-+INSTALLED_PREFIX=/usr
- INSTALLED_BINPREFIX = $(INSTALLED_PREFIX)/bin#NO SPACE
--INSTALLED_LIBPREFIX = $(INSTALLED_PREFIX)/lib#NO SPACE
-+INSTALLED_LIBPREFIX = $(INSTALLED_PREFIX)/$(get_libdir)#NO SPACE
-
- # chown installed tools to this user/group
- INSTALL_CHOWN = -g root -o root
-@@ -42,14 +42,14 @@
- ACCESSMODE = accessdaemon$#NO SPACE
-
- # Change to true to a build shared library instead of a static one
--SHARED_LIBRARY = true#NO SPACE
-+SHARED_LIBRARY = true
-
- # Build Fortran90 module interface for marker API. Adopt Fortran compiler
- # in ./make/include_<COMPILER>.mk if necessary. Default: ifort .
- FORTRAN_INTERFACE = false#NO SPACE
-
- # Instrument likwid-bench for use with likwid-perfctr
--INSTRUMENT_BENCH = false#NO SPACE
-+INSTRUMENT_BENCH = true#NO SPACE
-
- # Use Portable Hardware Locality (hwloc) instead of CPUID
- USE_HWLOC = true#NO SPACE
-@@ -67,6 +67,6 @@
- RELEASE = 0
- DATE = 28.04.2015
-
--LIBLIKWIDPIN = $(abspath $(PREFIX)/lib/liblikwidpin.so)
-+LIBLIKWIDPIN = $(abspath $(PREFIX)/$(get_libdir)/liblikwidpin.so)
- LIKWIDFILTERPATH = $(abspath $(PREFIX)/share/likwid/filter)
-
diff --git a/sys-apps/likwid/files/likwid-4.0.1-fix-gnustack.patch b/sys-apps/likwid/files/likwid-4.0.1-fix-gnustack.patch
deleted file mode 100644
index a0eaadf6cec1..000000000000
--- a/sys-apps/likwid/files/likwid-4.0.1-fix-gnustack.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- bench/Makefile.org 2015-08-22 13:56:17.242177531 +0800
-+++ bench/Makefile 2015-08-22 13:56:46.985086094 +0800
-@@ -118,6 +118,7 @@
- $(BUILD_DIR)/%.o: $(BUILD_DIR)/%.pas
- @echo "===> ASSEMBLE $@"
- $(Q)$(PAS) -i $(PASFLAGS) -o $(BUILD_DIR)/$*.s $< '$(DEFINES)'
-+ @cat ../b/fix_gnustack.txt >> $(BUILD_DIR)/$*.s
- $(Q)$(AS) $(ASFLAGS) $(BUILD_DIR)/$*.s -o $@
-
- ifeq ($(findstring $(MAKECMDGOALS),clean),)
-
-diff --git a/fix_gnustack.txt b/fix_gnustack.txt
-new file mode 100644
-index 0000000..965af94
---- /dev/null
-+++ b/fix_gnustack.txt
-@@ -0,0 +1,3 @@
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-
---- src/loadData.S.org 2015-08-22 14:26:28.634629884 +0800
-+++ src/loadData.S 2015-08-22 14:28:42.247210117 +0800
-@@ -41,4 +41,6 @@
- #endif
- .size _loadData, .-_loadData
-
--
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
diff --git a/sys-apps/likwid/files/likwid-4.0.1-lua-makefile.patch b/sys-apps/likwid/files/likwid-4.0.1-lua-makefile.patch
deleted file mode 100644
index 96065100997a..000000000000
--- a/sys-apps/likwid/files/likwid-4.0.1-lua-makefile.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Patch provided from upstream
-Add dependencies for Lua libraries to Makefile so that it can be build with multiple make jobs
-https://github.com/rrze-likwid/likwid/commit/bf12653e199d6d60055982bd92b284f44197bccf
-
---- ext/lua/Makefile.org 2015-08-21 09:53:48.430859982 +0800
-+++ ext/lua/Makefile 2015-08-21 09:51:50.905236819 +0800
-@@ -42,10 +42,10 @@
- $(BUILD_DIR):
- @mkdir $(BUILD_DIR)
-
--$(STATIC_LIBLUA):
-+$(STATIC_LIBLUA): $(OBJ)
- $(Q)${AR} -cq $(LIBLUA) $(OBJ)
-
--$(SHARED_LIBLUA):
-+$(SHARED_LIBLUA): $(OBJ)
- $(Q)$(CC) $(LFLAGS) -Wl,-soname,$(LIBLUA).$(VERSION) -shared -fPIC -o $(LIBLUA) $(OBJ) $(LIBS)
-
- $(INTERPRETER): $(SHARED_LIBLUA) $(BUILD_DIR)/lua.o