Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/sys-apps/likwid/files
diff options
context:
space:
mode:
Diffstat (limited to 'sys-apps/likwid/files')
-rw-r--r--sys-apps/likwid/files/likwid-4.1.1-Makefile.patch19
-rw-r--r--sys-apps/likwid/files/likwid-4.1.1-config.mk.patch43
-rw-r--r--sys-apps/likwid/files/likwid-4.1.1-fix-gnustack.patch31
-rw-r--r--sys-apps/likwid/files/likwid-4.1.2-Makefile.patch19
-rw-r--r--sys-apps/likwid/files/likwid-4.1.2-config.mk.patch43
-rw-r--r--sys-apps/likwid/files/likwid-4.1.2-fix-gnustack.patch31
6 files changed, 0 insertions, 186 deletions
diff --git a/sys-apps/likwid/files/likwid-4.1.1-Makefile.patch b/sys-apps/likwid/files/likwid-4.1.1-Makefile.patch
deleted file mode 100644
index cec5d590c4b5..000000000000
--- a/sys-apps/likwid/files/likwid-4.1.1-Makefile.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- likwid-likwid-4.1.1/Makefile.org 2016-07-14 12:09:56.612963529 +0800
-+++ likwid-likwid-4.1.1/Makefile 2016-07-14 12:11:24.148645584 +0800
-@@ -51,7 +51,6 @@
-
- #CONFIGURE BUILD SYSTEM
- BUILD_DIR = ./$(COMPILER)
--Q ?= @
- GENGROUPLOCK = .gengroup
-
- VPATH = $(SRC_DIR)
-@@ -544,7 +543,7 @@
- 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+" -e "s+$(PREFIX)/bin/likwid-pin+$(PWD)/likwid-pin+" -e "s+$(PREFIX)/bin/likwid-perfctr+$(PWD)/likwid-perfctr+" $$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
- @ln -sf liblikwid.so liblikwid.so.$(VERSION)
- @ln -sf ext/hwloc/liblikwid-hwloc.so liblikwid-hwloc.so.$(VERSION)
diff --git a/sys-apps/likwid/files/likwid-4.1.1-config.mk.patch b/sys-apps/likwid/files/likwid-4.1.1-config.mk.patch
deleted file mode 100644
index 36897e542665..000000000000
--- a/sys-apps/likwid/files/likwid-4.1.1-config.mk.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- likwid-likwid-4.1.1/config.mk.org 2016-07-14 12:49:27.791771509 +0800
-+++ likwid-likwid-4.1.1/config.mk 2016-07-14 12:51:27.470358158 +0800
-@@ -15,9 +15,9 @@
- # Common users do not need to change values below this comment! #
- #################################################################
-
--MANPREFIX = $(PREFIX)/man#NO SPACE
-+MANPREFIX = ${D}/usr/share/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
-@@ -26,9 +26,9 @@
- # Keep in mind that the access and setFreq daemon need enough
- # privileges that may be deleted when copying the files to
- # the INTSTALLED_PREFIX
--INSTALLED_PREFIX = $(PREFIX)#NO SPACE
-+INSTALLED_PREFIX=/usr#NO SPACE
- 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
- # if you change anything here, make sure that the user/group can access
-@@ -59,7 +59,7 @@
- FORTRAN_INTERFACE = false#NO SPACE
-
- # Instrument likwid-bench for use with likwid-perfctr
--INSTRUMENT_BENCH = false#NO SPACE
-+INSTRUMENT_BENCH = true#NO SPACE
-
- # Use recommended Portable Hardware Locality (hwloc) instead of CPUID
- USE_HWLOC = true#NO SPACE
-@@ -80,6 +80,6 @@
- DATE = 19.05.2016
-
- RPATHS = -Wl,-rpath=$(INSTALLED_LIBPREFIX)
--LIBLIKWIDPIN = $(abspath $(INSTALLED_PREFIX)/lib/liblikwidpin.so.$(VERSION).$(RELEASE))
-+LIBLIKWIDPIN = $(abspath $(PREFIX)/$(get_libdir)/liblikwidpin.so)
- LIKWIDFILTERPATH = $(abspath $(INSTALLED_PREFIX)/share/likwid/filter)
- LIKWIDGROUPPATH = $(abspath $(INSTALLED_PREFIX)/share/likwid/perfgroups)
diff --git a/sys-apps/likwid/files/likwid-4.1.1-fix-gnustack.patch b/sys-apps/likwid/files/likwid-4.1.1-fix-gnustack.patch
deleted file mode 100644
index a5a046d1f0df..000000000000
--- a/sys-apps/likwid/files/likwid-4.1.1-fix-gnustack.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- likwid-likwid-4.1.1/bench/Makefile.org 2015-08-22 13:56:17.242177531 +0800
-+++ likwid-likwid-4.1.1/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 ../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
-+++ likwid-likwid-4.1.1/fix_gnustack.txt
-@@ -0,0 +1,3 @@
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-
---- likwid-likwid-4.1.1/src/loadData.S.org 2015-08-22 14:26:28.634629884 +0800
-+++ likwid-likwid-4.1.1/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.1.2-Makefile.patch b/sys-apps/likwid/files/likwid-4.1.2-Makefile.patch
deleted file mode 100644
index cec5d590c4b5..000000000000
--- a/sys-apps/likwid/files/likwid-4.1.2-Makefile.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- likwid-likwid-4.1.1/Makefile.org 2016-07-14 12:09:56.612963529 +0800
-+++ likwid-likwid-4.1.1/Makefile 2016-07-14 12:11:24.148645584 +0800
-@@ -51,7 +51,6 @@
-
- #CONFIGURE BUILD SYSTEM
- BUILD_DIR = ./$(COMPILER)
--Q ?= @
- GENGROUPLOCK = .gengroup
-
- VPATH = $(SRC_DIR)
-@@ -544,7 +543,7 @@
- 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+" -e "s+$(PREFIX)/bin/likwid-pin+$(PWD)/likwid-pin+" -e "s+$(PREFIX)/bin/likwid-perfctr+$(PWD)/likwid-perfctr+" $$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
- @ln -sf liblikwid.so liblikwid.so.$(VERSION)
- @ln -sf ext/hwloc/liblikwid-hwloc.so liblikwid-hwloc.so.$(VERSION)
diff --git a/sys-apps/likwid/files/likwid-4.1.2-config.mk.patch b/sys-apps/likwid/files/likwid-4.1.2-config.mk.patch
deleted file mode 100644
index 36897e542665..000000000000
--- a/sys-apps/likwid/files/likwid-4.1.2-config.mk.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- likwid-likwid-4.1.1/config.mk.org 2016-07-14 12:49:27.791771509 +0800
-+++ likwid-likwid-4.1.1/config.mk 2016-07-14 12:51:27.470358158 +0800
-@@ -15,9 +15,9 @@
- # Common users do not need to change values below this comment! #
- #################################################################
-
--MANPREFIX = $(PREFIX)/man#NO SPACE
-+MANPREFIX = ${D}/usr/share/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
-@@ -26,9 +26,9 @@
- # Keep in mind that the access and setFreq daemon need enough
- # privileges that may be deleted when copying the files to
- # the INTSTALLED_PREFIX
--INSTALLED_PREFIX = $(PREFIX)#NO SPACE
-+INSTALLED_PREFIX=/usr#NO SPACE
- 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
- # if you change anything here, make sure that the user/group can access
-@@ -59,7 +59,7 @@
- FORTRAN_INTERFACE = false#NO SPACE
-
- # Instrument likwid-bench for use with likwid-perfctr
--INSTRUMENT_BENCH = false#NO SPACE
-+INSTRUMENT_BENCH = true#NO SPACE
-
- # Use recommended Portable Hardware Locality (hwloc) instead of CPUID
- USE_HWLOC = true#NO SPACE
-@@ -80,6 +80,6 @@
- DATE = 19.05.2016
-
- RPATHS = -Wl,-rpath=$(INSTALLED_LIBPREFIX)
--LIBLIKWIDPIN = $(abspath $(INSTALLED_PREFIX)/lib/liblikwidpin.so.$(VERSION).$(RELEASE))
-+LIBLIKWIDPIN = $(abspath $(PREFIX)/$(get_libdir)/liblikwidpin.so)
- LIKWIDFILTERPATH = $(abspath $(INSTALLED_PREFIX)/share/likwid/filter)
- LIKWIDGROUPPATH = $(abspath $(INSTALLED_PREFIX)/share/likwid/perfgroups)
diff --git a/sys-apps/likwid/files/likwid-4.1.2-fix-gnustack.patch b/sys-apps/likwid/files/likwid-4.1.2-fix-gnustack.patch
deleted file mode 100644
index a5a046d1f0df..000000000000
--- a/sys-apps/likwid/files/likwid-4.1.2-fix-gnustack.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- likwid-likwid-4.1.1/bench/Makefile.org 2015-08-22 13:56:17.242177531 +0800
-+++ likwid-likwid-4.1.1/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 ../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
-+++ likwid-likwid-4.1.1/fix_gnustack.txt
-@@ -0,0 +1,3 @@
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-
---- likwid-likwid-4.1.1/src/loadData.S.org 2015-08-22 14:26:28.634629884 +0800
-+++ likwid-likwid-4.1.1/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