1 |
commit: 034b6cf4547c19136e3010fdf71c11bc9d55602a |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Dec 11 13:48:15 2018 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Dec 11 13:48:15 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=034b6cf4 |
7 |
|
8 |
sys-apps/likwid: Remove last-rited pkg |
9 |
|
10 |
Closes: https://bugs.gentoo.org/648380 |
11 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
12 |
|
13 |
profiles/package.mask | 5 - |
14 |
sys-apps/likwid/Manifest | 2 - |
15 |
sys-apps/likwid/files/likwid-4.1.1-Makefile.patch | 19 ---- |
16 |
sys-apps/likwid/files/likwid-4.1.1-config.mk.patch | 43 --------- |
17 |
.../likwid/files/likwid-4.1.1-fix-gnustack.patch | 31 ------ |
18 |
sys-apps/likwid/files/likwid-4.1.2-Makefile.patch | 19 ---- |
19 |
sys-apps/likwid/files/likwid-4.1.2-config.mk.patch | 43 --------- |
20 |
.../likwid/files/likwid-4.1.2-fix-gnustack.patch | 31 ------ |
21 |
sys-apps/likwid/likwid-4.1.1.ebuild | 97 ------------------- |
22 |
sys-apps/likwid/likwid-4.1.2.ebuild | 104 --------------------- |
23 |
sys-apps/likwid/metadata.xml | 8 -- |
24 |
11 files changed, 402 deletions(-) |
25 |
|
26 |
diff --git a/profiles/package.mask b/profiles/package.mask |
27 |
index cc689546707..5831307defc 100644 |
28 |
--- a/profiles/package.mask |
29 |
+++ b/profiles/package.mask |
30 |
@@ -187,11 +187,6 @@ dev-db/mysql-proxy |
31 |
# Removal in a month. |
32 |
app-forensics/libbfio |
33 |
|
34 |
-# Pacho Ramos <pacho@g.o> (11 Nov 2018) |
35 |
-# Pending version bump (#648380), doesn't build (#637350). Removal in a |
36 |
-# month. |
37 |
-sys-apps/likwid |
38 |
- |
39 |
# Pacho Ramos <pacho@g.o> (11 Nov 2018) |
40 |
# Fails to build (#662000), not compatible with kernel-4, use kernel driver rtsx_pci |
41 |
# instead. Removal in a month. |
42 |
|
43 |
diff --git a/sys-apps/likwid/Manifest b/sys-apps/likwid/Manifest |
44 |
deleted file mode 100644 |
45 |
index e0ff5a27d92..00000000000 |
46 |
--- a/sys-apps/likwid/Manifest |
47 |
+++ /dev/null |
48 |
@@ -1,2 +0,0 @@ |
49 |
-DIST likwid-4.1.1.tar.gz 1395475 BLAKE2B 121d1b7fe94b6b2c8a8328caa29a6f47788bad701dd444c78d84fdf99a34fff65ecbe5534fc27bf270d81a425cadf4176f4d30bc518304020f8cce9d8b1ce83f SHA512 2561cc8203bf795ebe661a0b2f2e15fb68a164438b2c839482bab67a82babadbcfd78aaf519c4ceab6cfc799a363216023f77fe744e3b302facf5c578d7ab407 |
50 |
-DIST likwid-4.1.2.tar.gz 1398643 BLAKE2B cf4ca9f763ab1547e8ba388353b723c2976aa71ceaa628998d35f3ec4793cabb89bab6ebcc84df19e2b240607ab4a5a0ee1cde678741982cd029302fae385db6 SHA512 efb6a85947193204e08ce32e79c5f3ef15c7babca66930145af1c2eca8eccc2aeceea54a12715467161c646acc208bda3d01d07ea365ff8bdb9eafb022f107d9 |
51 |
|
52 |
diff --git a/sys-apps/likwid/files/likwid-4.1.1-Makefile.patch b/sys-apps/likwid/files/likwid-4.1.1-Makefile.patch |
53 |
deleted file mode 100644 |
54 |
index cec5d590c4b..00000000000 |
55 |
--- a/sys-apps/likwid/files/likwid-4.1.1-Makefile.patch |
56 |
+++ /dev/null |
57 |
@@ -1,19 +0,0 @@ |
58 |
---- likwid-likwid-4.1.1/Makefile.org 2016-07-14 12:09:56.612963529 +0800 |
59 |
-+++ likwid-likwid-4.1.1/Makefile 2016-07-14 12:11:24.148645584 +0800 |
60 |
-@@ -51,7 +51,6 @@ |
61 |
- |
62 |
- #CONFIGURE BUILD SYSTEM |
63 |
- BUILD_DIR = ./$(COMPILER) |
64 |
--Q ?= @ |
65 |
- GENGROUPLOCK = .gengroup |
66 |
- |
67 |
- VPATH = $(SRC_DIR) |
68 |
-@@ -544,7 +543,7 @@ |
69 |
- 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; \ |
70 |
- chmod +x $$APP; \ |
71 |
- done |
72 |
-- @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; |
73 |
-+ @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; |
74 |
- @sed -i -e "s+$(PREFIX)/share/likwid/mongroups+$(PWD)/monitoring/groups+g" likwid-agent |
75 |
- @ln -sf liblikwid.so liblikwid.so.$(VERSION) |
76 |
- @ln -sf ext/hwloc/liblikwid-hwloc.so liblikwid-hwloc.so.$(VERSION) |
77 |
|
78 |
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 |
79 |
deleted file mode 100644 |
80 |
index 36897e54266..00000000000 |
81 |
--- a/sys-apps/likwid/files/likwid-4.1.1-config.mk.patch |
82 |
+++ /dev/null |
83 |
@@ -1,43 +0,0 @@ |
84 |
---- likwid-likwid-4.1.1/config.mk.org 2016-07-14 12:49:27.791771509 +0800 |
85 |
-+++ likwid-likwid-4.1.1/config.mk 2016-07-14 12:51:27.470358158 +0800 |
86 |
-@@ -15,9 +15,9 @@ |
87 |
- # Common users do not need to change values below this comment! # |
88 |
- ################################################################# |
89 |
- |
90 |
--MANPREFIX = $(PREFIX)/man#NO SPACE |
91 |
-+MANPREFIX = ${D}/usr/share/man#NO SPACE |
92 |
- BINPREFIX = $(PREFIX)/bin#NO SPACE |
93 |
--LIBPREFIX = $(PREFIX)/lib#NO SPACE |
94 |
-+LIBPREFIX = $(PREFIX)/$(get_libdir)#NO SPACE |
95 |
- |
96 |
- # These paths are hardcoded into executables and libraries. Usually |
97 |
- # they'll be the same as above, but package maintainers may want to |
98 |
-@@ -26,9 +26,9 @@ |
99 |
- # Keep in mind that the access and setFreq daemon need enough |
100 |
- # privileges that may be deleted when copying the files to |
101 |
- # the INTSTALLED_PREFIX |
102 |
--INSTALLED_PREFIX = $(PREFIX)#NO SPACE |
103 |
-+INSTALLED_PREFIX=/usr#NO SPACE |
104 |
- INSTALLED_BINPREFIX = $(INSTALLED_PREFIX)/bin#NO SPACE |
105 |
--INSTALLED_LIBPREFIX = $(INSTALLED_PREFIX)/lib#NO SPACE |
106 |
-+INSTALLED_LIBPREFIX = $(INSTALLED_PREFIX)/$(get_libdir)#NO SPACE |
107 |
- |
108 |
- # chown installed tools to this user/group |
109 |
- # if you change anything here, make sure that the user/group can access |
110 |
-@@ -59,7 +59,7 @@ |
111 |
- FORTRAN_INTERFACE = false#NO SPACE |
112 |
- |
113 |
- # Instrument likwid-bench for use with likwid-perfctr |
114 |
--INSTRUMENT_BENCH = false#NO SPACE |
115 |
-+INSTRUMENT_BENCH = true#NO SPACE |
116 |
- |
117 |
- # Use recommended Portable Hardware Locality (hwloc) instead of CPUID |
118 |
- USE_HWLOC = true#NO SPACE |
119 |
-@@ -80,6 +80,6 @@ |
120 |
- DATE = 19.05.2016 |
121 |
- |
122 |
- RPATHS = -Wl,-rpath=$(INSTALLED_LIBPREFIX) |
123 |
--LIBLIKWIDPIN = $(abspath $(INSTALLED_PREFIX)/lib/liblikwidpin.so.$(VERSION).$(RELEASE)) |
124 |
-+LIBLIKWIDPIN = $(abspath $(PREFIX)/$(get_libdir)/liblikwidpin.so) |
125 |
- LIKWIDFILTERPATH = $(abspath $(INSTALLED_PREFIX)/share/likwid/filter) |
126 |
- LIKWIDGROUPPATH = $(abspath $(INSTALLED_PREFIX)/share/likwid/perfgroups) |
127 |
|
128 |
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 |
129 |
deleted file mode 100644 |
130 |
index a5a046d1f0d..00000000000 |
131 |
--- a/sys-apps/likwid/files/likwid-4.1.1-fix-gnustack.patch |
132 |
+++ /dev/null |
133 |
@@ -1,31 +0,0 @@ |
134 |
---- likwid-likwid-4.1.1/bench/Makefile.org 2015-08-22 13:56:17.242177531 +0800 |
135 |
-+++ likwid-likwid-4.1.1/bench/Makefile 2015-08-22 13:56:46.985086094 +0800 |
136 |
-@@ -118,6 +118,7 @@ |
137 |
- $(BUILD_DIR)/%.o: $(BUILD_DIR)/%.pas |
138 |
- @echo "===> ASSEMBLE $@" |
139 |
- $(Q)$(PAS) -i $(PASFLAGS) -o $(BUILD_DIR)/$*.s $< '$(DEFINES)' |
140 |
-+ @cat ../fix_gnustack.txt >> $(BUILD_DIR)/$*.s |
141 |
- $(Q)$(AS) $(ASFLAGS) $(BUILD_DIR)/$*.s -o $@ |
142 |
- |
143 |
- ifeq ($(findstring $(MAKECMDGOALS),clean),) |
144 |
- |
145 |
-diff --git a/fix_gnustack.txt b/fix_gnustack.txt |
146 |
-new file mode 100644 |
147 |
-index 0000000..965af94 |
148 |
---- /dev/null |
149 |
-+++ likwid-likwid-4.1.1/fix_gnustack.txt |
150 |
-@@ -0,0 +1,3 @@ |
151 |
-+#if defined(__linux__) && defined(__ELF__) |
152 |
-+.section .note.GNU-stack,"",%progbits |
153 |
-+#endif |
154 |
- |
155 |
---- likwid-likwid-4.1.1/src/loadData.S.org 2015-08-22 14:26:28.634629884 +0800 |
156 |
-+++ likwid-likwid-4.1.1/src/loadData.S 2015-08-22 14:28:42.247210117 +0800 |
157 |
-@@ -41,4 +41,6 @@ |
158 |
- #endif |
159 |
- .size _loadData, .-_loadData |
160 |
- |
161 |
-- |
162 |
-+#if defined(__linux__) && defined(__ELF__) |
163 |
-+.section .note.GNU-stack,"",%progbits |
164 |
-+#endif |
165 |
|
166 |
diff --git a/sys-apps/likwid/files/likwid-4.1.2-Makefile.patch b/sys-apps/likwid/files/likwid-4.1.2-Makefile.patch |
167 |
deleted file mode 100644 |
168 |
index cec5d590c4b..00000000000 |
169 |
--- a/sys-apps/likwid/files/likwid-4.1.2-Makefile.patch |
170 |
+++ /dev/null |
171 |
@@ -1,19 +0,0 @@ |
172 |
---- likwid-likwid-4.1.1/Makefile.org 2016-07-14 12:09:56.612963529 +0800 |
173 |
-+++ likwid-likwid-4.1.1/Makefile 2016-07-14 12:11:24.148645584 +0800 |
174 |
-@@ -51,7 +51,6 @@ |
175 |
- |
176 |
- #CONFIGURE BUILD SYSTEM |
177 |
- BUILD_DIR = ./$(COMPILER) |
178 |
--Q ?= @ |
179 |
- GENGROUPLOCK = .gengroup |
180 |
- |
181 |
- VPATH = $(SRC_DIR) |
182 |
-@@ -544,7 +543,7 @@ |
183 |
- 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; \ |
184 |
- chmod +x $$APP; \ |
185 |
- done |
186 |
-- @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; |
187 |
-+ @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; |
188 |
- @sed -i -e "s+$(PREFIX)/share/likwid/mongroups+$(PWD)/monitoring/groups+g" likwid-agent |
189 |
- @ln -sf liblikwid.so liblikwid.so.$(VERSION) |
190 |
- @ln -sf ext/hwloc/liblikwid-hwloc.so liblikwid-hwloc.so.$(VERSION) |
191 |
|
192 |
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 |
193 |
deleted file mode 100644 |
194 |
index 36897e54266..00000000000 |
195 |
--- a/sys-apps/likwid/files/likwid-4.1.2-config.mk.patch |
196 |
+++ /dev/null |
197 |
@@ -1,43 +0,0 @@ |
198 |
---- likwid-likwid-4.1.1/config.mk.org 2016-07-14 12:49:27.791771509 +0800 |
199 |
-+++ likwid-likwid-4.1.1/config.mk 2016-07-14 12:51:27.470358158 +0800 |
200 |
-@@ -15,9 +15,9 @@ |
201 |
- # Common users do not need to change values below this comment! # |
202 |
- ################################################################# |
203 |
- |
204 |
--MANPREFIX = $(PREFIX)/man#NO SPACE |
205 |
-+MANPREFIX = ${D}/usr/share/man#NO SPACE |
206 |
- BINPREFIX = $(PREFIX)/bin#NO SPACE |
207 |
--LIBPREFIX = $(PREFIX)/lib#NO SPACE |
208 |
-+LIBPREFIX = $(PREFIX)/$(get_libdir)#NO SPACE |
209 |
- |
210 |
- # These paths are hardcoded into executables and libraries. Usually |
211 |
- # they'll be the same as above, but package maintainers may want to |
212 |
-@@ -26,9 +26,9 @@ |
213 |
- # Keep in mind that the access and setFreq daemon need enough |
214 |
- # privileges that may be deleted when copying the files to |
215 |
- # the INTSTALLED_PREFIX |
216 |
--INSTALLED_PREFIX = $(PREFIX)#NO SPACE |
217 |
-+INSTALLED_PREFIX=/usr#NO SPACE |
218 |
- INSTALLED_BINPREFIX = $(INSTALLED_PREFIX)/bin#NO SPACE |
219 |
--INSTALLED_LIBPREFIX = $(INSTALLED_PREFIX)/lib#NO SPACE |
220 |
-+INSTALLED_LIBPREFIX = $(INSTALLED_PREFIX)/$(get_libdir)#NO SPACE |
221 |
- |
222 |
- # chown installed tools to this user/group |
223 |
- # if you change anything here, make sure that the user/group can access |
224 |
-@@ -59,7 +59,7 @@ |
225 |
- FORTRAN_INTERFACE = false#NO SPACE |
226 |
- |
227 |
- # Instrument likwid-bench for use with likwid-perfctr |
228 |
--INSTRUMENT_BENCH = false#NO SPACE |
229 |
-+INSTRUMENT_BENCH = true#NO SPACE |
230 |
- |
231 |
- # Use recommended Portable Hardware Locality (hwloc) instead of CPUID |
232 |
- USE_HWLOC = true#NO SPACE |
233 |
-@@ -80,6 +80,6 @@ |
234 |
- DATE = 19.05.2016 |
235 |
- |
236 |
- RPATHS = -Wl,-rpath=$(INSTALLED_LIBPREFIX) |
237 |
--LIBLIKWIDPIN = $(abspath $(INSTALLED_PREFIX)/lib/liblikwidpin.so.$(VERSION).$(RELEASE)) |
238 |
-+LIBLIKWIDPIN = $(abspath $(PREFIX)/$(get_libdir)/liblikwidpin.so) |
239 |
- LIKWIDFILTERPATH = $(abspath $(INSTALLED_PREFIX)/share/likwid/filter) |
240 |
- LIKWIDGROUPPATH = $(abspath $(INSTALLED_PREFIX)/share/likwid/perfgroups) |
241 |
|
242 |
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 |
243 |
deleted file mode 100644 |
244 |
index a5a046d1f0d..00000000000 |
245 |
--- a/sys-apps/likwid/files/likwid-4.1.2-fix-gnustack.patch |
246 |
+++ /dev/null |
247 |
@@ -1,31 +0,0 @@ |
248 |
---- likwid-likwid-4.1.1/bench/Makefile.org 2015-08-22 13:56:17.242177531 +0800 |
249 |
-+++ likwid-likwid-4.1.1/bench/Makefile 2015-08-22 13:56:46.985086094 +0800 |
250 |
-@@ -118,6 +118,7 @@ |
251 |
- $(BUILD_DIR)/%.o: $(BUILD_DIR)/%.pas |
252 |
- @echo "===> ASSEMBLE $@" |
253 |
- $(Q)$(PAS) -i $(PASFLAGS) -o $(BUILD_DIR)/$*.s $< '$(DEFINES)' |
254 |
-+ @cat ../fix_gnustack.txt >> $(BUILD_DIR)/$*.s |
255 |
- $(Q)$(AS) $(ASFLAGS) $(BUILD_DIR)/$*.s -o $@ |
256 |
- |
257 |
- ifeq ($(findstring $(MAKECMDGOALS),clean),) |
258 |
- |
259 |
-diff --git a/fix_gnustack.txt b/fix_gnustack.txt |
260 |
-new file mode 100644 |
261 |
-index 0000000..965af94 |
262 |
---- /dev/null |
263 |
-+++ likwid-likwid-4.1.1/fix_gnustack.txt |
264 |
-@@ -0,0 +1,3 @@ |
265 |
-+#if defined(__linux__) && defined(__ELF__) |
266 |
-+.section .note.GNU-stack,"",%progbits |
267 |
-+#endif |
268 |
- |
269 |
---- likwid-likwid-4.1.1/src/loadData.S.org 2015-08-22 14:26:28.634629884 +0800 |
270 |
-+++ likwid-likwid-4.1.1/src/loadData.S 2015-08-22 14:28:42.247210117 +0800 |
271 |
-@@ -41,4 +41,6 @@ |
272 |
- #endif |
273 |
- .size _loadData, .-_loadData |
274 |
- |
275 |
-- |
276 |
-+#if defined(__linux__) && defined(__ELF__) |
277 |
-+.section .note.GNU-stack,"",%progbits |
278 |
-+#endif |
279 |
|
280 |
diff --git a/sys-apps/likwid/likwid-4.1.1.ebuild b/sys-apps/likwid/likwid-4.1.1.ebuild |
281 |
deleted file mode 100644 |
282 |
index 3c1df6ff760..00000000000 |
283 |
--- a/sys-apps/likwid/likwid-4.1.1.ebuild |
284 |
+++ /dev/null |
285 |
@@ -1,97 +0,0 @@ |
286 |
-# Copyright 1999-2016 Gentoo Foundation |
287 |
-# Distributed under the terms of the GNU General Public License v2 |
288 |
- |
289 |
-EAPI=6 |
290 |
- |
291 |
-FORTRAN_NEEDED=fortran |
292 |
- |
293 |
-inherit fcaps linux-info fortran-2 |
294 |
- |
295 |
-DESCRIPTION="A performance-oriented tool suite for x86 multicore environments" |
296 |
-HOMEPAGE="https://github.com/rrze-likwid/likwid" |
297 |
-SRC_URI="https://github.com/RRZE-HPC/likwid/archive/likwid-4.1.1.tar.gz" |
298 |
- |
299 |
-LICENSE="GPL-3+" |
300 |
-SLOT="0" |
301 |
-KEYWORDS="~amd64" |
302 |
-IUSE="fortran" |
303 |
- |
304 |
-RDEPEND="dev-lang/perl" |
305 |
- |
306 |
-DEPEND="${RDEPEND} |
307 |
- fortran? ( sys-devel/gcc:*[fortran] ) |
308 |
- dev-lang/lua:0" |
309 |
- |
310 |
-CONFIG_CHECK="~X86_MSR" |
311 |
- |
312 |
-FILECAPS=( |
313 |
- -M 755 cap_sys_rawio usr/sbin/likwid-accessD -- |
314 |
- -M 755 cap_sys_rawio usr/bin/likwid-{perfctr,bench,powermeter} |
315 |
-) |
316 |
- |
317 |
-# See Bug 558402 |
318 |
-PATCHES=( |
319 |
- "${FILESDIR}/${P}-Makefile.patch" |
320 |
- "${FILESDIR}/${P}-fix-gnustack.patch" |
321 |
- "${FILESDIR}/${P}-config.mk.patch" |
322 |
-) |
323 |
- |
324 |
-S=${WORKDIR}/likwid-likwid-${PV} |
325 |
- |
326 |
-src_prepare() { |
327 |
- # Set PREFIX path to include sandbox path |
328 |
- sed -e 's:^PREFIX = .*:PREFIX = '${D}'/usr:' -i config.mk || die |
329 |
- |
330 |
- # Set the path to library directory. |
331 |
- sed -e 's:$(get_libdir):'$(get_libdir)':' -i config.mk || die "Cannot set library path!" |
332 |
- |
333 |
- # Set correct LDFLAGS |
334 |
- sed -e '/LIBS/aSHARED_LFLAGS += -Wl,-soname,$@' \ |
335 |
- -i make/include_GCC.mk || die |
336 |
- |
337 |
- # Insert date and version info man pages |
338 |
- sed -e 's/<DATE>/21.08.2015/g' \ |
339 |
- -e "s/VERSION/${PV}/g" \ |
340 |
- -i doc/*.1 || die |
341 |
- |
342 |
- # Set path to the access daemon, once installed into the system |
343 |
- sed -e "/exeprog/s|TOSTRING(ACCESSDAEMON)|\"/usr/sbin/likwid-accessD\"|" \ |
344 |
- -i src/access_client.c || die |
345 |
- |
346 |
- # Ensure we build with a non executable stack |
347 |
- sed -e "s:CFLAGS += \$(SHARED_CFLAGS):CFLAGS += \$(SHARED_CFLAGS) -g -Wa,--noexecstack:" \ |
348 |
- -i make/config_defines.mk || die |
349 |
- |
350 |
- if use fortran; then |
351 |
- |
352 |
- # If fortran USE is enabled, enable the fortran interfaces |
353 |
- sed -i 's:^FORTRAN_INTERFACE = false:FORTRAN_INTERFACE = likwid.mod:' config.mk || die |
354 |
- |
355 |
- # Set the correct fortrant compiler for GCC |
356 |
- sed -i "s:^FC = ifort:FC = ${FC}:" make/include_GCC.mk || die |
357 |
- |
358 |
- # Set the correct FCFLAGS for gcc fortran |
359 |
- sed -i '/^FCFLAGS/c\FCFLAGS = -J ./ -fsyntax-only' make/include_GCC.mk || die |
360 |
- fi |
361 |
- |
362 |
- default |
363 |
- |
364 |
-} |
365 |
- |
366 |
-src_install () { |
367 |
- default |
368 |
- if use fortran; then |
369 |
- insinto /usr/include |
370 |
- doins likwid.mod |
371 |
- fi |
372 |
- |
373 |
- doman doc/*.1 |
374 |
-} |
375 |
- |
376 |
-pkg_postinst() { |
377 |
- fcaps_pkg_postinst |
378 |
- ewarn "To enable users to access performance counters it is necessary to" |
379 |
- ewarn "change the access permissions to /dev/cpu/msr[0]* devices." |
380 |
- ewarn "It can be accomplished by adding the following line to file" |
381 |
- ewarn "/etc/udev/rules.d/99-myrules.rules: KERNEL==\"msr[0-9]*\" MODE=\"0666\"" |
382 |
-} |
383 |
|
384 |
diff --git a/sys-apps/likwid/likwid-4.1.2.ebuild b/sys-apps/likwid/likwid-4.1.2.ebuild |
385 |
deleted file mode 100644 |
386 |
index 769fddf7e5a..00000000000 |
387 |
--- a/sys-apps/likwid/likwid-4.1.2.ebuild |
388 |
+++ /dev/null |
389 |
@@ -1,104 +0,0 @@ |
390 |
-# Copyright 1999-2016 Gentoo Foundation |
391 |
-# Distributed under the terms of the GNU General Public License v2 |
392 |
- |
393 |
-EAPI=6 |
394 |
- |
395 |
-FORTRAN_NEEDED=fortran |
396 |
- |
397 |
-inherit fcaps linux-info toolchain-funcs fortran-2 |
398 |
- |
399 |
-DESCRIPTION="A performance-oriented tool suite for x86 multicore environments" |
400 |
-HOMEPAGE="https://github.com/rrze-likwid/likwid" |
401 |
-SRC_URI="https://ftp.fau.de/pub/likwid/${P}.tar.gz" |
402 |
- |
403 |
-LICENSE="GPL-3+" |
404 |
-SLOT="0" |
405 |
-KEYWORDS="~amd64" |
406 |
-IUSE="fortran" |
407 |
- |
408 |
-RDEPEND="dev-lang/perl" |
409 |
- |
410 |
-DEPEND="${RDEPEND} |
411 |
- fortran? ( sys-devel/gcc:*[fortran] ) |
412 |
- dev-lang/lua:0" |
413 |
- |
414 |
-CONFIG_CHECK="~X86_MSR" |
415 |
- |
416 |
-FILECAPS=( |
417 |
- -M 755 cap_sys_rawio usr/sbin/likwid-accessD -- |
418 |
- -M 755 cap_sys_rawio usr/bin/likwid-{perfctr,bench,powermeter} |
419 |
-) |
420 |
- |
421 |
-# See Bug 558402 |
422 |
-PATCHES=( |
423 |
- "${FILESDIR}/${P}-Makefile.patch" |
424 |
- "${FILESDIR}/${P}-fix-gnustack.patch" |
425 |
- "${FILESDIR}/${P}-config.mk.patch" |
426 |
-) |
427 |
- |
428 |
-src_prepare() { |
429 |
- # Set PREFIX path to include sandbox path |
430 |
- sed -e 's:^PREFIX = .*:PREFIX = '${D}'/usr:' -i config.mk || \ |
431 |
- die "Failed to set correct prefix path" |
432 |
- |
433 |
- # Set the path to library directory. |
434 |
- sed -e 's:$(get_libdir):'$(get_libdir)':' -i config.mk || \ |
435 |
- die "Cannot set library path!" |
436 |
- |
437 |
- # Set correct LDFLAGS |
438 |
- sed -e '/LIBS/aSHARED_LFLAGS += -Wl,-soname,$@' \ |
439 |
- -i make/include_GCC.mk || die "Failed to set correct LDFLAGS" |
440 |
- |
441 |
- # Insert date and version info man pages |
442 |
- sed -e 's/<DATE>/21.08.2015/g' \ |
443 |
- -e "s/VERSION/${PV}/g" \ |
444 |
- -i doc/*.1 || die "Failed to insert date into man pages" |
445 |
- |
446 |
- # Set path to the access daemon, once installed into the system |
447 |
- sed -e "/exeprog/s|TOSTRING(ACCESSDAEMON)|\"/usr/sbin/likwid-accessD\"|" \ |
448 |
- -i src/access_client.c || die "Failed to set access daemon path" |
449 |
- |
450 |
- # Ensure we build with a non executable stack |
451 |
- sed -e "s:\$(SHARED_CFLAGS): \$(SHARED_CFLAGS) -Wa,--noexecstack:" \ |
452 |
- -i make/config_defines.mk || die "Failed to set nonexecstack" |
453 |
- |
454 |
- if use fortran; then |
455 |
- |
456 |
- # If fortran USE is enabled, enable the fortran interfaces |
457 |
- sed -i 's:^FORTRAN_INTERFACE = false:FORTRAN_INTERFACE = likwid.mod:' \ |
458 |
- config.mk || die "Enabling of fortran failed" |
459 |
- |
460 |
- # Set the correct fortran compiler for GCC |
461 |
- sed -i "s:^FC = ifort:FC = ${FC}:" make/include_GCC.mk \ |
462 |
- || die "Failed to set fortran compiler" |
463 |
- |
464 |
- # Set the correct FCFLAGS for gcc fortran |
465 |
- sed -i '/^FCFLAGS/c\FCFLAGS = -J ./ -fsyntax-only' make/include_GCC.mk \ |
466 |
- || die "Failed to set GCC flags for fortran" |
467 |
- fi |
468 |
- |
469 |
- # Respect CC |
470 |
- sed -e "s:^CC.*:CC = $(tc-getCC):" \ |
471 |
- -i make/include_GCC.mk || die |
472 |
- |
473 |
- default |
474 |
- |
475 |
-} |
476 |
- |
477 |
-src_install () { |
478 |
- default |
479 |
- if use fortran; then |
480 |
- insinto /usr/include |
481 |
- doins likwid.mod |
482 |
- fi |
483 |
- |
484 |
- doman doc/*.1 |
485 |
-} |
486 |
- |
487 |
-pkg_postinst() { |
488 |
- fcaps_pkg_postinst |
489 |
- ewarn "To enable users to access performance counters it is necessary to" |
490 |
- ewarn "change the access permissions to /dev/cpu/msr[0]* devices." |
491 |
- ewarn "It can be accomplished by adding the following line to file" |
492 |
- ewarn "/etc/udev/rules.d/99-myrules.rules: KERNEL==\"msr[0-9]*\" MODE=\"0666\"" |
493 |
-} |
494 |
|
495 |
diff --git a/sys-apps/likwid/metadata.xml b/sys-apps/likwid/metadata.xml |
496 |
deleted file mode 100644 |
497 |
index 69f8f4152ad..00000000000 |
498 |
--- a/sys-apps/likwid/metadata.xml |
499 |
+++ /dev/null |
500 |
@@ -1,8 +0,0 @@ |
501 |
-<?xml version="1.0" encoding="UTF-8"?> |
502 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
503 |
-<pkgmetadata> |
504 |
- <!-- maintainer-needed --> |
505 |
- <upstream> |
506 |
- <remote-id type="github">rrze-likwid/likwid</remote-id> |
507 |
- </upstream> |
508 |
-</pkgmetadata> |