| 1 |
dlan 15/03/06 14:54:27 |
| 2 |
|
| 3 |
Added: likwid-3.1.3-fix-gnustack.patch |
| 4 |
likwid-3.1.3-Makefile.patch |
| 5 |
Log: |
| 6 |
initial ebuild, contributed by Brendan Horan, bug 373607 |
| 7 |
|
| 8 |
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 0xAABEFD55) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 sys-apps/likwid/files/likwid-3.1.3-fix-gnustack.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/likwid/files/likwid-3.1.3-fix-gnustack.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/likwid/files/likwid-3.1.3-fix-gnustack.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: likwid-3.1.3-fix-gnustack.patch |
| 17 |
=================================================================== |
| 18 |
diff --git a/Makefile b/Makefile |
| 19 |
index eecd4e9..34eee7c 100644 |
| 20 |
--- a/Makefile |
| 21 |
+++ b/Makefile |
| 22 |
@@ -259,6 +259,7 @@ $(BUILD_DIR)/%.h: $(SRC_DIR)/includes/%.txt |
| 23 |
$(BUILD_DIR)/%.o: $(BUILD_DIR)/%.pas |
| 24 |
@echo "===> ASSEMBLE $@" |
| 25 |
$(Q)$(PAS) -i $(PASFLAGS) -o $(BUILD_DIR)/$*.s $< '$(DEFINES)' |
| 26 |
+ @cat fix_gnustack.txt >> $(BUILD_DIR)/$*.s |
| 27 |
$(Q)$(AS) $(ASFLAGS) $(BUILD_DIR)/$*.s -o $@ |
| 28 |
|
| 29 |
ifeq ($(findstring $(MAKECMDGOALS),clean),) |
| 30 |
diff --git a/fix_gnustack.txt b/fix_gnustack.txt |
| 31 |
new file mode 100644 |
| 32 |
index 0000000..965af94 |
| 33 |
--- /dev/null |
| 34 |
+++ b/fix_gnustack.txt |
| 35 |
@@ -0,0 +1,3 @@ |
| 36 |
+#if defined(__linux__) && defined(__ELF__) |
| 37 |
+.section .note.GNU-stack,"",%progbits |
| 38 |
+#endif |
| 39 |
diff --git a/src/loadData.s b/src/loadData.s |
| 40 |
index e176c53..9934f7d 100644 |
| 41 |
--- a/src/loadData.s |
| 42 |
+++ b/src/loadData.s |
| 43 |
@@ -20,3 +20,6 @@ ret |
| 44 |
.size _loadData, .-_loadData |
| 45 |
|
| 46 |
|
| 47 |
+#if defined(__linux__) && defined(__ELF__) |
| 48 |
+.section .note.GNU-stack,"",%progbits |
| 49 |
+#endif |
| 50 |
|
| 51 |
|
| 52 |
|
| 53 |
1.1 sys-apps/likwid/files/likwid-3.1.3-Makefile.patch |
| 54 |
|
| 55 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/likwid/files/likwid-3.1.3-Makefile.patch?rev=1.1&view=markup |
| 56 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/likwid/files/likwid-3.1.3-Makefile.patch?rev=1.1&content-type=text/plain |
| 57 |
|
| 58 |
Index: likwid-3.1.3-Makefile.patch |
| 59 |
=================================================================== |
| 60 |
--- Makefile.org 2015-03-04 16:25:59.942213571 +0800 |
| 61 |
+++ Makefile 2015-03-04 16:46:05.640278082 +0800 |
| 62 |
@@ -87,7 +87,7 @@ |
| 63 |
|
| 64 |
LIKWID_LIB = liblikwid |
| 65 |
ifeq ($(SHARED_LIBRARY),true) |
| 66 |
-CFLAGS += $(SHARED_CFLAGS) -ggdb |
| 67 |
+CFLAGS += $(SHARED_CFLAGS) -g -Wa,--noexecstack |
| 68 |
DYNAMIC_TARGET_LIB := $(LIKWID_LIB).so |
| 69 |
TARGET_LIB := $(DYNAMIC_TARGET_LIB) |
| 70 |
LIBS += -L. -llikwid |
| 71 |
@@ -307,28 +307,8 @@ |
| 72 |
echo "Only root can adjust the privileges of the daemon applications in $(PREFIX)/sbin"; \ |
| 73 |
fi; \ |
| 74 |
done |
| 75 |
- @echo "===> INSTALL man pages to $(MANPREFIX)/man1" |
| 76 |
- @mkdir -p $(MANPREFIX)/man1 |
| 77 |
- @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-topology.1 > $(MANPREFIX)/man1/likwid-topology.1 |
| 78 |
- @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-features.1 > $(MANPREFIX)/man1/likwid-features.1 |
| 79 |
- @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-perfctr.1 > $(MANPREFIX)/man1/likwid-perfctr.1 |
| 80 |
- @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-powermeter.1 > $(MANPREFIX)/man1/likwid-powermeter.1 |
| 81 |
- @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-pin.1 > $(MANPREFIX)/man1/likwid-pin.1 |
| 82 |
- @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-setFrequencies.1 > $(MANPREFIX)/man1/likwid-setFrequencies.1 |
| 83 |
- @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-bench.1 > $(MANPREFIX)/man1/likwid-bench.1 |
| 84 |
- @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/feedGnuplot.1 > $(MANPREFIX)/man1/feedGnuplot.1 |
| 85 |
- @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-accessD.1 > $(MANPREFIX)/man1/likwid-accessD.1 |
| 86 |
- @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-genCfg.1 > $(MANPREFIX)/man1/likwid-genCfg.1 |
| 87 |
- @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-memsweeper.1 > $(MANPREFIX)/man1/likwid-memsweeper.1 |
| 88 |
- @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-mpirun.1 > $(MANPREFIX)/man1/likwid-mpirun.1 |
| 89 |
- @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-perfscope.1 > $(MANPREFIX)/man1/likwid-perfscope.1 |
| 90 |
- @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-setFreq.1 > $(MANPREFIX)/man1/likwid-setFreq.1 |
| 91 |
- @chmod 644 $(MANPREFIX)/man1/likwid-* |
| 92 |
- @echo "===> INSTALL headers to $(PREFIX)/include" |
| 93 |
- @mkdir -p $(PREFIX)/include/likwid |
| 94 |
- @cp -f src/includes/likwid*.h $(PREFIX)/include/ |
| 95 |
- @cp -f src/includes/* $(PREFIX)/include/likwid |
| 96 |
- @cp -f GCC/perfmon_group_types.h $(PREFIX)/include/likwid |
| 97 |
+ @echo "===> INSTALL man pages" |
| 98 |
+ @mkdir -p $(PREFIX)/include/ |
| 99 |
$(FORTRAN_INSTALL) |
| 100 |
@echo "===> INSTALL libraries to $(PREFIX)/lib" |
| 101 |
@mkdir -p $(PREFIX)/lib |
Archives