Gentoo Archives: gentoo-commits

From: Alessandro Barbieri <lssndrbarbieri@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:dev commit in: sys-apps/intel-cmt-cat/files/, sys-apps/intel-cmt-cat/
Date: Tue, 26 Apr 2022 10:57:13
Message-Id: 1650970605.a9e8e245a9f098381631ae9f40c1e8a66253c074.Alessandro-Barbieri@gentoo
1 commit: a9e8e245a9f098381631ae9f40c1e8a66253c074
2 Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
3 AuthorDate: Tue Apr 26 10:56:45 2022 +0000
4 Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
5 CommitDate: Tue Apr 26 10:56:45 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a9e8e245
7
8 sys-apps/intel-cmt-cat: add 4.4.0, drop 4.2.0-r2
9
10 Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
11
12 sys-apps/intel-cmt-cat/Manifest | 2 +-
13 .../files/intel-cmt-cat-4.4.0-no-strip.patch | 15 ++
14 .../files/intel-cmt-cat-4.4.0-perl-makefile.patch | 22 +++
15 .../files/intel-cmt-cat-do-not-strip.patch | 32 ----
16 .../files/intel-cmt-cat-respect-flags.patch | 212 ---------------------
17 ...-4.2.0-r2.ebuild => intel-cmt-cat-4.4.0.ebuild} | 20 +-
18 6 files changed, 49 insertions(+), 254 deletions(-)
19
20 diff --git a/sys-apps/intel-cmt-cat/Manifest b/sys-apps/intel-cmt-cat/Manifest
21 index 8820d1e5a..453e3f0f4 100644
22 --- a/sys-apps/intel-cmt-cat/Manifest
23 +++ b/sys-apps/intel-cmt-cat/Manifest
24 @@ -1,2 +1,2 @@
25 -DIST intel-cmt-cat-4.2.0.tar.gz 470596 BLAKE2B 781e69a7019a27e87b6b6c8d2c914305a837d019cadf8d1b6221942c631e0e46531a292379d7979ae88e7a590b155bc4e5a62777bdd9ebfb2881471ef64bfa32 SHA512 ccfae2e3fa5bb8b7dfe5ed39ab20a8526eb759378aeb14fb7ed79f4f94820cd69e497c9e7d411f1d9ec40c07ca4c7c4f2db6ff1e034a8517c01c06bd8a70d4b6
26 DIST intel-cmt-cat-4.3.0.tar.gz 478547 BLAKE2B 09dc746f9861dd1db5bdf7a46c469b57dbcf5215a9b418207581d4fe5abcdc4157169ace781f34f17228a5b4ad130af3a01f760d2c679be4c7d4efd3fc8208e4 SHA512 8229af3e931d7f32f1723c38cea9d3197554c076d64030256b05d44c2f1e6c3271501352ed4a8a8f4027a7c196f0a1fcf45fff48cb6f0f14c1d1ef45f7784fcd
27 +DIST intel-cmt-cat-4.4.0.tar.gz 494818 BLAKE2B 827b5b001612ce0241088aabe2cfb87f460148e5321f92ff9f0a1b9d58ac1afe25e32afc3c842736f33f338e80a8ba64d983271504d8dc2cc89fcc95ff903b9a SHA512 3882304976f5a27bb7085a764ac481114c403281648e288f75db3dba325c46572b88d5d47841711cf1bdc77f4706fb28026036f871bbfb763a66bcc226e1728d
28
29 diff --git a/sys-apps/intel-cmt-cat/files/intel-cmt-cat-4.4.0-no-strip.patch b/sys-apps/intel-cmt-cat/files/intel-cmt-cat-4.4.0-no-strip.patch
30 new file mode 100644
31 index 000000000..99d261cd0
32 --- /dev/null
33 +++ b/sys-apps/intel-cmt-cat/files/intel-cmt-cat-4.4.0-no-strip.patch
34 @@ -0,0 +1,15 @@
35 +--- a/tools/membw/Makefile
36 ++++ b/tools/membw/Makefile
37 +@@ -94,10 +94,10 @@
38 + ifeq ($(shell uname), FreeBSD)
39 + install -d $(BIN_DIR)
40 + install -d $(MAN_DIR)
41 +- install -s $(APP) $(BIN_DIR)
42 ++ install $(APP) $(BIN_DIR)
43 + install -m 0444 $(MAN) $(MAN_DIR)
44 + else
45 +- install -D -s $(APP) $(BIN_DIR)/$(APP)
46 ++ install -D $(APP) $(BIN_DIR)/$(APP)
47 + install -m 0444 $(MAN) -D $(MAN_DIR)/$(MAN)
48 + endif
49 +
50
51 diff --git a/sys-apps/intel-cmt-cat/files/intel-cmt-cat-4.4.0-perl-makefile.patch b/sys-apps/intel-cmt-cat/files/intel-cmt-cat-4.4.0-perl-makefile.patch
52 new file mode 100644
53 index 000000000..4355779d7
54 --- /dev/null
55 +++ b/sys-apps/intel-cmt-cat/files/intel-cmt-cat-4.4.0-perl-makefile.patch
56 @@ -0,0 +1,22 @@
57 +--- a/lib/perl/Makefile.PL
58 ++++ b/lib/perl/Makefile.PL
59 +@@ -42,8 +42,8 @@
60 + WriteMakefile(
61 + 'NAME' => 'pqos',
62 + 'VERSION' => "0.1",
63 +- 'CCFLAGS' => "$Config{ccflags} -Wno-unused-variable -Wno-unused-value -Wno-misleading-indentation",
64 +- 'LIBS' => ['-lpqos', '-L/usr/local/lib -lpqos'],
65 ++ 'CCFLAGS' => "$Config{ccflags} -Wno-unused-variable -Wno-unused-value -Wno-misleading-indentation -I..",
66 ++ 'LIBS' => ['-lpqos', '-L.. -lpqos'],
67 + 'OBJECT' => 'pqos_wrap.o',
68 + 'clean' => {FILES => "pqos_wrap.c"},
69 + );
70 +@@ -56,7 +56,7 @@
71 +
72 + my $swig_target = <<"SWIG_MAKEFILE";
73 + pqos_wrap.c:
74 +- $swig -perl -outdir \$(INST_LIB) -I/usr/local/include \$(EXTRA_SWIGFLAGS) pqos.i
75 ++ $swig -perl -outdir \$(INST_LIB) -I.. \$(EXTRA_SWIGFLAGS) pqos.i
76 + SWIG_MAKEFILE
77 +
78 + my $perltidy_targets = <<'PERLTIDY_MAKEFILE';
79
80 diff --git a/sys-apps/intel-cmt-cat/files/intel-cmt-cat-do-not-strip.patch b/sys-apps/intel-cmt-cat/files/intel-cmt-cat-do-not-strip.patch
81 deleted file mode 100644
82 index 44ea45617..000000000
83 --- a/sys-apps/intel-cmt-cat/files/intel-cmt-cat-do-not-strip.patch
84 +++ /dev/null
85 @@ -1,32 +0,0 @@
86 ---- a/pqos/Makefile
87 -+++ b/pqos/Makefile
88 -@@ -108,12 +108,12 @@
89 - ifeq ($(shell uname), FreeBSD)
90 - install -d $(BIN_DIR)
91 - install -d $(MAN_DIR)
92 -- install -s $(APP) $(BIN_DIR)
93 -+ install $(APP) $(BIN_DIR)
94 - install $(APP)-msr $(BIN_DIR)
95 - install -m 0444 $(MAN) $(MAN_DIR)
96 - ln -f -s $(MAN) $(MAN_DIR)/$(APP)-msr.8
97 - else
98 -- install -D -s $(APP) $(BIN_DIR)/$(APP)
99 -+ install -D $(APP) $(BIN_DIR)/$(APP)
100 - install -D $(APP)-msr $(BIN_DIR)/$(APP)-msr
101 - install -D $(APP)-os $(BIN_DIR)/$(APP)-os
102 - install -m 0444 $(MAN) -D $(MAN_DIR)/$(MAN)
103 ---- a/rdtset/Makefile
104 -+++ b/rdtset/Makefile
105 -@@ -115,10 +115,10 @@
106 - ifeq ($(shell uname), FreeBSD)
107 - install -d $(BIN_DIR)
108 - install -d $(MAN_DIR)
109 -- install -s $(APP) $(BIN_DIR)
110 -+ install $(APP) $(BIN_DIR)
111 - install -m 0444 $(MAN) $(MAN_DIR)
112 - else
113 -- install -D -s $(APP) $(BIN_DIR)/$(APP)
114 -+ install -D $(APP) $(BIN_DIR)/$(APP)
115 - install -m 0444 $(MAN) -D $(MAN_DIR)/$(MAN)
116 - endif
117 -
118
119 diff --git a/sys-apps/intel-cmt-cat/files/intel-cmt-cat-respect-flags.patch b/sys-apps/intel-cmt-cat/files/intel-cmt-cat-respect-flags.patch
120 deleted file mode 100644
121 index 81b591060..000000000
122 --- a/sys-apps/intel-cmt-cat/files/intel-cmt-cat-respect-flags.patch
123 +++ /dev/null
124 @@ -1,212 +0,0 @@
125 ---- a/examples/c/CAT_MBA/Makefile
126 -+++ b/examples/c/CAT_MBA/Makefile
127 -@@ -35,17 +35,17 @@
128 - ###############################################################################
129 -
130 - LIBDIR ?= ../../../lib
131 --CFLAGS =-I$(LIBDIR) \
132 -+CFLAGS += -I$(LIBDIR) \
133 - -W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
134 - -Wmissing-declarations -Wold-style-definition -Wpointer-arith \
135 - -Wcast-qual -Wundef -Wwrite-strings \
136 -- -Wformat -Wformat-security -fstack-protector -fPIE -D_FORTIFY_SOURCE=2 \
137 -- -Wunreachable-code -Wsign-compare -Wno-endif-labels \
138 -- -g -O2
139 -+ -Wformat -Wformat-security -fPIE \
140 -+ -Wunreachable-code -Wsign-compare -Wno-endif-labels
141 -+
142 - ifneq ($(EXTRA_CFLAGS),)
143 - CFLAGS += $(EXTRA_CFLAGS)
144 - endif
145 --LDFLAGS=-L$(LIBDIR) -pie -z noexecstack -z relro -z now
146 -+LDFLAGS += -L$(LIBDIR) -pie -z noexecstack -z relro -z now
147 - LDLIBS=-lpqos -lpthread
148 -
149 - # ICC and GCC options
150 ---- a/examples/c/CMT_MBM/Makefile
151 -+++ b/examples/c/CMT_MBM/Makefile
152 -@@ -35,17 +35,17 @@
153 - ###############################################################################
154 -
155 - LIBDIR ?= ../../../lib
156 --CFLAGS =-I$(LIBDIR) -pthread \
157 -+CFLAGS += -I$(LIBDIR) -pthread \
158 - -W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
159 - -Wmissing-declarations -Wold-style-definition -Wpointer-arith \
160 - -Wcast-qual -Wundef -Wwrite-strings \
161 -- -Wformat -Wformat-security -fstack-protector -fPIE -D_FORTIFY_SOURCE=2 \
162 -- -Wunreachable-code -Wsign-compare -Wno-endif-labels \
163 -- -g -O2
164 -+ -Wformat -Wformat-security -fPIE \
165 -+ -Wunreachable-code -Wsign-compare -Wno-endif-labels
166 -+
167 - ifneq ($(EXTRA_CFLAGS),)
168 - CFLAGS += $(EXTRA_CFLAGS)
169 - endif
170 --LDFLAGS=-L$(LIBDIR) -pie -z noexecstack -z relro -z now
171 -+LDFLAGS += -L$(LIBDIR) -pie -z noexecstack -z relro -z now
172 - LDLIBS=-lpqos -lpthread
173 -
174 - # ICC and GCC options
175 ---- a/examples/c/PSEUDO_LOCK/Makefile
176 -+++ b/examples/c/PSEUDO_LOCK/Makefile
177 -@@ -35,15 +35,15 @@
178 - ###############################################################################
179 -
180 - LIBDIR ?= ../../../lib
181 --LDFLAGS = -L$(LIBDIR) -pie -z noexecstack -z relro -z now
182 -+LDFLAGS += -L$(LIBDIR) -pie -z noexecstack -z relro -z now
183 - LDLIBS = -lpqos -lrt -lpthread
184 --CFLAGS = -I$(LIBDIR) \
185 -+CFLAGS += -I$(LIBDIR) \
186 - -W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
187 - -Wmissing-declarations -Wold-style-definition -Wpointer-arith \
188 - -Wcast-qual -Wundef -Wwrite-strings \
189 -- -Wformat -Wformat-security -fstack-protector -fPIE -D_FORTIFY_SOURCE=2 \
190 -- -Wunreachable-code -Wsign-compare -Wno-endif-labels \
191 -- -g -O2
192 -+ -Wformat -Wformat-security -fPIE \
193 -+ -Wunreachable-code -Wsign-compare -Wno-endif-labels
194 -+
195 - ifneq ($(EXTRA_CFLAGS),)
196 - CFLAGS += $(EXTRA_CFLAGS)
197 - endif
198 ---- a/lib/Makefile
199 -+++ b/lib/Makefile
200 -@@ -37,12 +37,12 @@
201 - VERSION = 4.2.0
202 - SO_VERSION = 4
203 - SHARED ?= y
204 --LDFLAGS = -L. -lpthread -z noexecstack -z relro -z now
205 --CFLAGS = -pthread -I./ -D_GNU_SOURCE \
206 -+LDFLAGS += -L. -lpthread -z noexecstack -z relro -z now
207 -+CFLAGS += -pthread -I./ -D_GNU_SOURCE \
208 - -W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
209 - -Wmissing-declarations -Wold-style-definition -Wpointer-arith \
210 - -Wcast-qual -Wundef -Wwrite-strings \
211 -- -Wformat -Wformat-security -fstack-protector \
212 -+ -Wformat -Wformat-security \
213 - -Wunreachable-code -Wsign-compare -Wno-endif-labels
214 - ifneq ($(EXTRA_CFLAGS),)
215 - CFLAGS += $(EXTRA_CFLAGS)
216 -@@ -83,9 +83,7 @@
217 -
218 - # DEBUG build
219 - ifeq ($(DEBUG),y)
220 --CFLAGS += -g -ggdb -O0 -DDEBUG
221 --else
222 --CFLAGS += -g -O2 -D_FORTIFY_SOURCE=2
223 -+CFLAGS += -DDEBUG
224 - endif
225 -
226 - # RMID CUSTOM
227 ---- a/pqos/Makefile
228 -+++ b/pqos/Makefile
229 -@@ -35,13 +35,13 @@
230 - ###############################################################################
231 -
232 - LIBDIR ?= ../lib
233 --LDFLAGS = -L$(LIBDIR) -pie -z noexecstack -z relro -z now
234 -+LDFLAGS += -L$(LIBDIR) -pie -z noexecstack -z relro -z now
235 - LDLIBS = -lpqos -lpthread
236 --CFLAGS = -I$(LIBDIR) \
237 -+CFLAGS += -I$(LIBDIR) \
238 - -W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
239 - -Wmissing-declarations -Wold-style-definition -Wpointer-arith \
240 - -Wcast-qual -Wundef -Wwrite-strings \
241 -- -Wformat -Wformat-security -fstack-protector -fPIE \
242 -+ -Wformat -Wformat-security -fPIE \
243 - -Wunreachable-code -Wsign-compare -Wno-endif-labels
244 - ifneq ($(EXTRA_CFLAGS),)
245 - CFLAGS += $(EXTRA_CFLAGS)
246 -@@ -68,9 +68,7 @@
247 -
248 - # DEBUG build
249 - ifeq ($(DEBUG),y)
250 --CFLAGS += -g -ggdb -O0 -DDEBUG
251 --else
252 --CFLAGS += -g -O2 -D_FORTIFY_SOURCE=2
253 -+CFLAGS += -DDEBUG
254 - endif
255 -
256 - # RMID CUSTOM
257 ---- a/rdtset/Makefile
258 -+++ b/rdtset/Makefile
259 -@@ -35,13 +35,13 @@
260 - ###############################################################################
261 -
262 - LIBDIR ?= ../lib
263 --LDFLAGS = -L$(LIBDIR) -pie -z noexecstack -z relro -z now
264 -+LDFLAGS += -L$(LIBDIR) -pie -z noexecstack -z relro -z now
265 - LDLIBS = -lpqos -lpthread
266 --CFLAGS = -I$(LIBDIR) \
267 -+CFLAGS += -I$(LIBDIR) \
268 - -W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
269 - -Wmissing-declarations -Wold-style-definition -Wpointer-arith \
270 - -Wcast-qual -Wundef -Wwrite-strings \
271 -- -Wformat -Wformat-security -fstack-protector -fPIE \
272 -+ -Wformat -Wformat-security -fPIE \
273 - -Wunreachable-code -Wsign-compare -Wno-endif-labels \
274 - -D_GNU_SOURCE
275 - ifneq ($(EXTRA_CFLAGS),)
276 -@@ -69,9 +69,7 @@
277 -
278 - # DEBUG build
279 - ifeq ($(DEBUG),y)
280 --CFLAGS += -g -ggdb -O0 -DDEBUG
281 --else
282 --CFLAGS += -g -O2 -D_FORTIFY_SOURCE=2
283 -+CFLAGS += -DDEBUG
284 - endif
285 -
286 - # RMID CUSTOM
287 ---- a/tools/membw/Makefile
288 -+++ b/tools/membw/Makefile
289 -@@ -36,17 +36,15 @@
290 -
291 - APP = membw
292 -
293 --CFLAGS=-W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
294 -+CFLAGS += -W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
295 - -Wmissing-declarations -Wold-style-definition -Wpointer-arith \
296 - -Wcast-qual -Wundef -Wwrite-strings \
297 -- -Wformat -Wformat-security -fstack-protector -fPIE \
298 -+ -Wformat -Wformat-security -fPIE \
299 - -Wunreachable-code -Wsign-compare -Wno-endif-labels \
300 -- -Winline -msse4.2
301 -+ -Winline
302 -
303 - ifeq ($(DEBUG),y)
304 --CFLAGS += -O0 -g -DDEBUG
305 --else
306 --CFLAGS += -O3 -g -D_FORTIFY_SOURCE=2
307 -+CFLAGS += -DDEBUG
308 - endif
309 -
310 - HAS_AVX512 := $(shell $(CC) -mavx512f -dM -E - < /dev/null 2> /dev/null | grep -c "AVX512F")
311 ---- a/unit-test/lib/Makefile
312 -+++ b/unit-test/lib/Makefile
313 -@@ -15,13 +15,13 @@
314 - TESTS = $(TESTS_SRCS:%.c=$(BIN_DIR)/%)
315 -
316 -
317 --LDFLAGS = -L$(MOCK_DIR) -lpthread -lcmocka -lpqosmock -z noexecstack -z relro -z now
318 --CFLAGS = -pthread -I$(LIB_DIR) -I$(MOCK_DIR) \
319 -+LDFLAGS += -L$(MOCK_DIR) -lpthread -lcmocka -lpqosmock -z noexecstack -z relro -z now
320 -+CFLAGS += -pthread -I$(LIB_DIR) -I$(MOCK_DIR) \
321 - -D_GNU_SOURCE \
322 - -W -Wall -Wextra -Wstrict-prototypes \
323 - -Wold-style-definition -Wpointer-arith \
324 - -Wcast-qual -Wundef -Wwrite-strings \
325 -- -Wformat -Wformat-security -fstack-protector \
326 -+ -Wformat -Wformat-security \
327 - -Wunreachable-code -Wsign-compare -Wno-endif-labels \
328 - -D'PQOS_LOCAL=' -D'PQOS_API='
329 -
330 -@@ -527,4 +527,4 @@
331 -
332 - clean:
333 - rm -rf $(BIN_DIR)
334 -- rm -rf $(OBJ_DIR)
335 -\ Manca newline alla fine del file
336 -+ rm -rf $(OBJ_DIR)
337
338 diff --git a/sys-apps/intel-cmt-cat/intel-cmt-cat-4.2.0-r2.ebuild b/sys-apps/intel-cmt-cat/intel-cmt-cat-4.4.0.ebuild
339 similarity index 86%
340 rename from sys-apps/intel-cmt-cat/intel-cmt-cat-4.2.0-r2.ebuild
341 rename to sys-apps/intel-cmt-cat/intel-cmt-cat-4.4.0.ebuild
342 index 09341e17b..a883db783 100644
343 --- a/sys-apps/intel-cmt-cat/intel-cmt-cat-4.2.0-r2.ebuild
344 +++ b/sys-apps/intel-cmt-cat/intel-cmt-cat-4.4.0.ebuild
345 @@ -1,4 +1,4 @@
346 -# Copyright 2020-2021 Gentoo Authors
347 +# Copyright 2020-2022 Gentoo Authors
348 # Distributed under the terms of the GNU General Public License v2
349
350 EAPI=8
351 @@ -34,14 +34,16 @@ RDEPEND="
352 "
353 DEPEND="
354 ${RDEPEND}
355 - test? ( appqos? ( dev-python/mock[${PYTHON_USEDEP}] ) )
356 + test? (
357 + appqos? ( dev-python/mock[${PYTHON_USEDEP}] )
358 + )
359 "
360
361 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
362 PATCHES=(
363 - "${FILESDIR}/${PN}-perl-makefile.patch"
364 - "${FILESDIR}/${PN}-do-not-strip.patch"
365 - "${FILESDIR}/${PN}-respect-flags.patch"
366 + "${FILESDIR}/${P}-perl-makefile.patch"
367 + "${FILESDIR}/${P}-no-strip.patch"
368 + "${FILESDIR}/${PN}-4.3.0-respect-flags.patch"
369 )
370
371 distutils_enable_tests unittest
372 @@ -79,7 +81,7 @@ src_install() {
373 dobin tools/membw/membw
374 dobin snmp/rdt-agentx.pl
375
376 - dodoc ChangeLog README
377 + dodoc ChangeLog README.md
378 docinto membw
379 dodoc tools/membw/README
380 docinto pqos
381 @@ -87,7 +89,7 @@ src_install() {
382 docinto lib
383 dodoc lib/README
384 docinto lib/python
385 - dodoc lib/python/README.txt
386 + dodoc lib/python/README.md
387 docinto snmp
388 dodoc snmp/README
389 docinto rdtset
390 @@ -101,7 +103,7 @@ src_install() {
391 unset DOCS
392 python_foreach_impl python_install
393
394 - if use perl ; then
395 + if use perl; then
396 pushd "lib/perl" || die
397 unset DOCS
398 myinst=( DESTDIR="${D}" )
399 @@ -113,7 +115,7 @@ src_install() {
400 }
401
402 src_test() {
403 - python_foreach_impl python_test
404 + LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${S}/lib" python_foreach_impl python_test
405 }
406
407 python_install() {