summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /sys-apps/likwid/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
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
2 files changed, 74 insertions, 0 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
new file mode 100644
index 000000000000..a40d0c3262a2
--- /dev/null
+++ b/sys-apps/likwid/files/likwid-3.1.3-Makefile.patch
@@ -0,0 +1,42 @@
+--- 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
new file mode 100644
index 000000000000..6ee4149dd5d7
--- /dev/null
+++ b/sys-apps/likwid/files/likwid-3.1.3-fix-gnustack.patch
@@ -0,0 +1,32 @@
+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