mirrors/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2026-07-10 23:52:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

sys-apps/intel-cmt-cat: add 4.4.0, drop 4.2.0-r2

Browse Source 
Signed-off-by: Alessandro Barbieri <lssndrbarbieri@gmail.com>
This commit is contained in:
Alessandro Barbieri
2022-04-26 12:56:45 +02:00
parent 8ba1e8a9c8
commit a9e8e245a9
6 changed files with 49 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sys-apps/intel-cmt-cat/Manifest
View File

@@ -1,2 +1,2 @@
DIST intel-cmt-cat-4.2.0.tar.gz 470596 BLAKE2B 781e69a7019a27e87b6b6c8d2c914305a837d019cadf8d1b6221942c631e0e46531a292379d7979ae88e7a590b155bc4e5a62777bdd9ebfb2881471ef64bfa32 SHA512 ccfae2e3fa5bb8b7dfe5ed39ab20a8526eb759378aeb14fb7ed79f4f94820cd69e497c9e7d411f1d9ec40c07ca4c7c4f2db6ff1e034a8517c01c06bd8a70d4b6
DIST intel-cmt-cat-4.3.0.tar.gz 478547 BLAKE2B 09dc746f9861dd1db5bdf7a46c469b57dbcf5215a9b418207581d4fe5abcdc4157169ace781f34f17228a5b4ad130af3a01f760d2c679be4c7d4efd3fc8208e4 SHA512 8229af3e931d7f32f1723c38cea9d3197554c076d64030256b05d44c2f1e6c3271501352ed4a8a8f4027a7c196f0a1fcf45fff48cb6f0f14c1d1ef45f7784fcd
DIST intel-cmt-cat-4.4.0.tar.gz 494818 BLAKE2B 827b5b001612ce0241088aabe2cfb87f460148e5321f92ff9f0a1b9d58ac1afe25e32afc3c842736f33f338e80a8ba64d983271504d8dc2cc89fcc95ff903b9a SHA512 3882304976f5a27bb7085a764ac481114c403281648e288f75db3dba325c46572b88d5d47841711cf1bdc77f4706fb28026036f871bbfb763a66bcc226e1728d

15
sys-apps/intel-cmt-cat/files/intel-cmt-cat-4.4.0-no-strip.patch Normal file
View File

@@ -0,0 +1,15 @@
--- a/tools/membw/Makefile
+++ b/tools/membw/Makefile
@@ -94,10 +94,10 @@
ifeq ($(shell uname), FreeBSD)
install -d $(BIN_DIR)
install -d $(MAN_DIR)
- install -s $(APP) $(BIN_DIR)
+ install $(APP) $(BIN_DIR)
install -m 0444 $(MAN) $(MAN_DIR)
else
- install -D -s $(APP) $(BIN_DIR)/$(APP)
+ install -D $(APP) $(BIN_DIR)/$(APP)
install -m 0444 $(MAN) -D $(MAN_DIR)/$(MAN)
endif

22
sys-apps/intel-cmt-cat/files/intel-cmt-cat-4.4.0-perl-makefile.patch Normal file
View File

@@ -0,0 +1,22 @@
--- a/lib/perl/Makefile.PL
+++ b/lib/perl/Makefile.PL
@@ -42,8 +42,8 @@
WriteMakefile(
'NAME' => 'pqos',
'VERSION' => "0.1",
- 'CCFLAGS' => "$Config{ccflags} -Wno-unused-variable -Wno-unused-value -Wno-misleading-indentation",
- 'LIBS' => ['-lpqos', '-L/usr/local/lib -lpqos'],
+ 'CCFLAGS' => "$Config{ccflags} -Wno-unused-variable -Wno-unused-value -Wno-misleading-indentation -I..",
+ 'LIBS' => ['-lpqos', '-L.. -lpqos'],
'OBJECT' => 'pqos_wrap.o',
'clean' => {FILES => "pqos_wrap.c"},
);
@@ -56,7 +56,7 @@
my $swig_target = <<"SWIG_MAKEFILE";
pqos_wrap.c:
- $swig -perl -outdir \$(INST_LIB) -I/usr/local/include \$(EXTRA_SWIGFLAGS) pqos.i
+ $swig -perl -outdir \$(INST_LIB) -I.. \$(EXTRA_SWIGFLAGS) pqos.i
SWIG_MAKEFILE
my $perltidy_targets = <<'PERLTIDY_MAKEFILE';

32
sys-apps/intel-cmt-cat/files/intel-cmt-cat-do-not-strip.patch
View File

@@ -1,32 +0,0 @@
--- a/pqos/Makefile
+++ b/pqos/Makefile
@@ -108,12 +108,12 @@
ifeq ($(shell uname), FreeBSD)
install -d $(BIN_DIR)
install -d $(MAN_DIR)
- install -s $(APP) $(BIN_DIR)
+ install $(APP) $(BIN_DIR)
install $(APP)-msr $(BIN_DIR)
install -m 0444 $(MAN) $(MAN_DIR)
ln -f -s $(MAN) $(MAN_DIR)/$(APP)-msr.8
else
- install -D -s $(APP) $(BIN_DIR)/$(APP)
+ install -D $(APP) $(BIN_DIR)/$(APP)
install -D $(APP)-msr $(BIN_DIR)/$(APP)-msr
install -D $(APP)-os $(BIN_DIR)/$(APP)-os
install -m 0444 $(MAN) -D $(MAN_DIR)/$(MAN)
--- a/rdtset/Makefile
+++ b/rdtset/Makefile
@@ -115,10 +115,10 @@
ifeq ($(shell uname), FreeBSD)
install -d $(BIN_DIR)
install -d $(MAN_DIR)
- install -s $(APP) $(BIN_DIR)
+ install $(APP) $(BIN_DIR)
install -m 0444 $(MAN) $(MAN_DIR)
else
- install -D -s $(APP) $(BIN_DIR)/$(APP)
+ install -D $(APP) $(BIN_DIR)/$(APP)
install -m 0444 $(MAN) -D $(MAN_DIR)/$(MAN)
endif

212
sys-apps/intel-cmt-cat/files/intel-cmt-cat-respect-flags.patch
View File

@@ -1,212 +0,0 @@
--- a/examples/c/CAT_MBA/Makefile
+++ b/examples/c/CAT_MBA/Makefile
@@ -35,17 +35,17 @@
###############################################################################
LIBDIR ?= ../../../lib
-CFLAGS =-I$(LIBDIR) \
+CFLAGS += -I$(LIBDIR) \
-W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
-Wmissing-declarations -Wold-style-definition -Wpointer-arith \
-Wcast-qual -Wundef -Wwrite-strings \
- -Wformat -Wformat-security -fstack-protector -fPIE -D_FORTIFY_SOURCE=2 \
- -Wunreachable-code -Wsign-compare -Wno-endif-labels \
- -g -O2
+ -Wformat -Wformat-security -fPIE \
+ -Wunreachable-code -Wsign-compare -Wno-endif-labels
+
ifneq ($(EXTRA_CFLAGS),)
CFLAGS += $(EXTRA_CFLAGS)
endif
-LDFLAGS=-L$(LIBDIR) -pie -z noexecstack -z relro -z now
+LDFLAGS += -L$(LIBDIR) -pie -z noexecstack -z relro -z now
LDLIBS=-lpqos -lpthread
# ICC and GCC options
--- a/examples/c/CMT_MBM/Makefile
+++ b/examples/c/CMT_MBM/Makefile
@@ -35,17 +35,17 @@
###############################################################################
LIBDIR ?= ../../../lib
-CFLAGS =-I$(LIBDIR) -pthread \
+CFLAGS += -I$(LIBDIR) -pthread \
-W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
-Wmissing-declarations -Wold-style-definition -Wpointer-arith \
-Wcast-qual -Wundef -Wwrite-strings \
- -Wformat -Wformat-security -fstack-protector -fPIE -D_FORTIFY_SOURCE=2 \
- -Wunreachable-code -Wsign-compare -Wno-endif-labels \
- -g -O2
+ -Wformat -Wformat-security -fPIE \
+ -Wunreachable-code -Wsign-compare -Wno-endif-labels
+
ifneq ($(EXTRA_CFLAGS),)
CFLAGS += $(EXTRA_CFLAGS)
endif
-LDFLAGS=-L$(LIBDIR) -pie -z noexecstack -z relro -z now
+LDFLAGS += -L$(LIBDIR) -pie -z noexecstack -z relro -z now
LDLIBS=-lpqos -lpthread
# ICC and GCC options
--- a/examples/c/PSEUDO_LOCK/Makefile
+++ b/examples/c/PSEUDO_LOCK/Makefile
@@ -35,15 +35,15 @@
###############################################################################
LIBDIR ?= ../../../lib
-LDFLAGS = -L$(LIBDIR) -pie -z noexecstack -z relro -z now
+LDFLAGS += -L$(LIBDIR) -pie -z noexecstack -z relro -z now
LDLIBS = -lpqos -lrt -lpthread
-CFLAGS = -I$(LIBDIR) \
+CFLAGS += -I$(LIBDIR) \
-W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
-Wmissing-declarations -Wold-style-definition -Wpointer-arith \
-Wcast-qual -Wundef -Wwrite-strings \
- -Wformat -Wformat-security -fstack-protector -fPIE -D_FORTIFY_SOURCE=2 \
- -Wunreachable-code -Wsign-compare -Wno-endif-labels \
- -g -O2
+ -Wformat -Wformat-security -fPIE \
+ -Wunreachable-code -Wsign-compare -Wno-endif-labels
+
ifneq ($(EXTRA_CFLAGS),)
CFLAGS += $(EXTRA_CFLAGS)
endif
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -37,12 +37,12 @@
VERSION = 4.2.0
SO_VERSION = 4
SHARED ?= y
-LDFLAGS = -L. -lpthread -z noexecstack -z relro -z now
-CFLAGS = -pthread -I./ -D_GNU_SOURCE \
+LDFLAGS += -L. -lpthread -z noexecstack -z relro -z now
+CFLAGS += -pthread -I./ -D_GNU_SOURCE \
-W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
-Wmissing-declarations -Wold-style-definition -Wpointer-arith \
-Wcast-qual -Wundef -Wwrite-strings \
- -Wformat -Wformat-security -fstack-protector \
+ -Wformat -Wformat-security \
-Wunreachable-code -Wsign-compare -Wno-endif-labels
ifneq ($(EXTRA_CFLAGS),)
CFLAGS += $(EXTRA_CFLAGS)
@@ -83,9 +83,7 @@
# DEBUG build
ifeq ($(DEBUG),y)
-CFLAGS += -g -ggdb -O0 -DDEBUG
-else
-CFLAGS += -g -O2 -D_FORTIFY_SOURCE=2
+CFLAGS += -DDEBUG
endif
# RMID CUSTOM
--- a/pqos/Makefile
+++ b/pqos/Makefile
@@ -35,13 +35,13 @@
###############################################################################
LIBDIR ?= ../lib
-LDFLAGS = -L$(LIBDIR) -pie -z noexecstack -z relro -z now
+LDFLAGS += -L$(LIBDIR) -pie -z noexecstack -z relro -z now
LDLIBS = -lpqos -lpthread
-CFLAGS = -I$(LIBDIR) \
+CFLAGS += -I$(LIBDIR) \
-W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
-Wmissing-declarations -Wold-style-definition -Wpointer-arith \
-Wcast-qual -Wundef -Wwrite-strings \
- -Wformat -Wformat-security -fstack-protector -fPIE \
+ -Wformat -Wformat-security -fPIE \
-Wunreachable-code -Wsign-compare -Wno-endif-labels
ifneq ($(EXTRA_CFLAGS),)
CFLAGS += $(EXTRA_CFLAGS)
@@ -68,9 +68,7 @@
# DEBUG build
ifeq ($(DEBUG),y)
-CFLAGS += -g -ggdb -O0 -DDEBUG
-else
-CFLAGS += -g -O2 -D_FORTIFY_SOURCE=2
+CFLAGS += -DDEBUG
endif
# RMID CUSTOM
--- a/rdtset/Makefile
+++ b/rdtset/Makefile
@@ -35,13 +35,13 @@
###############################################################################
LIBDIR ?= ../lib
-LDFLAGS = -L$(LIBDIR) -pie -z noexecstack -z relro -z now
+LDFLAGS += -L$(LIBDIR) -pie -z noexecstack -z relro -z now
LDLIBS = -lpqos -lpthread
-CFLAGS = -I$(LIBDIR) \
+CFLAGS += -I$(LIBDIR) \
-W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
-Wmissing-declarations -Wold-style-definition -Wpointer-arith \
-Wcast-qual -Wundef -Wwrite-strings \
- -Wformat -Wformat-security -fstack-protector -fPIE \
+ -Wformat -Wformat-security -fPIE \
-Wunreachable-code -Wsign-compare -Wno-endif-labels \
-D_GNU_SOURCE
ifneq ($(EXTRA_CFLAGS),)
@@ -69,9 +69,7 @@
# DEBUG build
ifeq ($(DEBUG),y)
-CFLAGS += -g -ggdb -O0 -DDEBUG
-else
-CFLAGS += -g -O2 -D_FORTIFY_SOURCE=2
+CFLAGS += -DDEBUG
endif
# RMID CUSTOM
--- a/tools/membw/Makefile
+++ b/tools/membw/Makefile
@@ -36,17 +36,15 @@
APP = membw
-CFLAGS=-W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
+CFLAGS += -W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
-Wmissing-declarations -Wold-style-definition -Wpointer-arith \
-Wcast-qual -Wundef -Wwrite-strings \
- -Wformat -Wformat-security -fstack-protector -fPIE \
+ -Wformat -Wformat-security -fPIE \
-Wunreachable-code -Wsign-compare -Wno-endif-labels \
- -Winline -msse4.2
+ -Winline
ifeq ($(DEBUG),y)
-CFLAGS += -O0 -g -DDEBUG
-else
-CFLAGS += -O3 -g -D_FORTIFY_SOURCE=2
+CFLAGS += -DDEBUG
endif
HAS_AVX512 := $(shell $(CC) -mavx512f -dM -E - < /dev/null 2> /dev/null | grep -c "AVX512F")
--- a/unit-test/lib/Makefile
+++ b/unit-test/lib/Makefile
@@ -15,13 +15,13 @@
TESTS = $(TESTS_SRCS:%.c=$(BIN_DIR)/%)
-LDFLAGS = -L$(MOCK_DIR) -lpthread -lcmocka -lpqosmock -z noexecstack -z relro -z now
-CFLAGS = -pthread -I$(LIB_DIR) -I$(MOCK_DIR) \
+LDFLAGS += -L$(MOCK_DIR) -lpthread -lcmocka -lpqosmock -z noexecstack -z relro -z now
+CFLAGS += -pthread -I$(LIB_DIR) -I$(MOCK_DIR) \
-D_GNU_SOURCE \
-W -Wall -Wextra -Wstrict-prototypes \
-Wold-style-definition -Wpointer-arith \
-Wcast-qual -Wundef -Wwrite-strings \
- -Wformat -Wformat-security -fstack-protector \
+ -Wformat -Wformat-security \
-Wunreachable-code -Wsign-compare -Wno-endif-labels \
-D'PQOS_LOCAL=' -D'PQOS_API='
@@ -527,4 +527,4 @@
clean:
rm -rf $(BIN_DIR)
- rm -rf $(OBJ_DIR)
\ Manca newline alla fine del file
+ rm -rf $(OBJ_DIR)

20
sys-apps/intel-cmt-cat/intel-cmt-cat-4.2.0-r2.ebuild → sys-apps/intel-cmt-cat/intel-cmt-cat-4.4.0.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 2020-2021 Gentoo Authors
# Copyright 2020-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -34,14 +34,16 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
test? ( appqos? ( dev-python/mock[${PYTHON_USEDEP}] ) )
test? (
appqos? ( dev-python/mock[${PYTHON_USEDEP}] )
)
"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
PATCHES=(
"${FILESDIR}/${PN}-perl-makefile.patch"
"${FILESDIR}/${PN}-do-not-strip.patch"
"${FILESDIR}/${PN}-respect-flags.patch"
"${FILESDIR}/${P}-perl-makefile.patch"
"${FILESDIR}/${P}-no-strip.patch"
"${FILESDIR}/${PN}-4.3.0-respect-flags.patch"
)
distutils_enable_tests unittest
@@ -79,7 +81,7 @@ src_install() {
dobin tools/membw/membw
dobin snmp/rdt-agentx.pl
dodoc ChangeLog README
dodoc ChangeLog README.md
docinto membw
dodoc tools/membw/README
docinto pqos
@@ -87,7 +89,7 @@ src_install() {
docinto lib
dodoc lib/README
docinto lib/python
dodoc lib/python/README.txt
dodoc lib/python/README.md
docinto snmp
dodoc snmp/README
docinto rdtset
@@ -101,7 +103,7 @@ src_install() {
unset DOCS
python_foreach_impl python_install
if use perl ; then
if use perl; then
pushd "lib/perl" || die
unset DOCS
myinst=( DESTDIR="${D}" )
@@ -113,7 +115,7 @@ src_install() {
}
src_test() {
python_foreach_impl python_test
LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${S}/lib" python_foreach_impl python_test
}
python_install() {