gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-23 16:49:10 -07:00
Code Issues Projects Releases Wiki Activity

sys-apps/likwid: Remove last-rited pkg

Browse Source 
Closes: https://bugs.gentoo.org/648380
Signed-off-by: Michał Górny <mgorny@gentoo.org>
This commit is contained in:
Michał Górny
2018-12-11 14:48:15 +01:00
parent 0c1e120a31
commit 034b6cf454
11 changed files with 0 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
profiles/package.mask
View File

@@ -187,11 +187,6 @@ dev-db/mysql-proxy
# Removal in a month.
app-forensics/libbfio
# Pacho Ramos <pacho@gentoo.org> (11 Nov 2018)
# Pending version bump (#648380), doesn't build (#637350). Removal in a
# month.
sys-apps/likwid
# Pacho Ramos <pacho@gentoo.org> (11 Nov 2018)
# Fails to build (#662000), not compatible with kernel-4, use kernel driver rtsx_pci
# instead. Removal in a month.

2
sys-apps/likwid/Manifest
View File

@@ -1,2 +0,0 @@
DIST likwid-4.1.1.tar.gz 1395475 BLAKE2B 121d1b7fe94b6b2c8a8328caa29a6f47788bad701dd444c78d84fdf99a34fff65ecbe5534fc27bf270d81a425cadf4176f4d30bc518304020f8cce9d8b1ce83f SHA512 2561cc8203bf795ebe661a0b2f2e15fb68a164438b2c839482bab67a82babadbcfd78aaf519c4ceab6cfc799a363216023f77fe744e3b302facf5c578d7ab407
DIST likwid-4.1.2.tar.gz 1398643 BLAKE2B cf4ca9f763ab1547e8ba388353b723c2976aa71ceaa628998d35f3ec4793cabb89bab6ebcc84df19e2b240607ab4a5a0ee1cde678741982cd029302fae385db6 SHA512 efb6a85947193204e08ce32e79c5f3ef15c7babca66930145af1c2eca8eccc2aeceea54a12715467161c646acc208bda3d01d07ea365ff8bdb9eafb022f107d9

19
sys-apps/likwid/files/likwid-4.1.1-Makefile.patch
View File

@@ -1,19 +0,0 @@
--- likwid-likwid-4.1.1/Makefile.org 2016-07-14 12:09:56.612963529 +0800
+++ likwid-likwid-4.1.1/Makefile 2016-07-14 12:11:24.148645584 +0800
@@ -51,7 +51,6 @@
#CONFIGURE BUILD SYSTEM
BUILD_DIR = ./$(COMPILER)
-Q ?= @
GENGROUPLOCK = .gengroup
VPATH = $(SRC_DIR)
@@ -544,7 +543,7 @@
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; \
chmod +x $$APP; \
done
- @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;
+ @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;
@sed -i -e "s+$(PREFIX)/share/likwid/mongroups+$(PWD)/monitoring/groups+g" likwid-agent
@ln -sf liblikwid.so liblikwid.so.$(VERSION)
@ln -sf ext/hwloc/liblikwid-hwloc.so liblikwid-hwloc.so.$(VERSION)

43
sys-apps/likwid/files/likwid-4.1.1-config.mk.patch
View File

@@ -1,43 +0,0 @@
--- likwid-likwid-4.1.1/config.mk.org 2016-07-14 12:49:27.791771509 +0800
+++ likwid-likwid-4.1.1/config.mk 2016-07-14 12:51:27.470358158 +0800
@@ -15,9 +15,9 @@
# Common users do not need to change values below this comment! #
#################################################################
-MANPREFIX = $(PREFIX)/man#NO SPACE
+MANPREFIX = ${D}/usr/share/man#NO SPACE
BINPREFIX = $(PREFIX)/bin#NO SPACE
-LIBPREFIX = $(PREFIX)/lib#NO SPACE
+LIBPREFIX = $(PREFIX)/$(get_libdir)#NO SPACE
# These paths are hardcoded into executables and libraries. Usually
# they'll be the same as above, but package maintainers may want to
@@ -26,9 +26,9 @@
# Keep in mind that the access and setFreq daemon need enough
# privileges that may be deleted when copying the files to
# the INTSTALLED_PREFIX
-INSTALLED_PREFIX = $(PREFIX)#NO SPACE
+INSTALLED_PREFIX=/usr#NO SPACE
INSTALLED_BINPREFIX = $(INSTALLED_PREFIX)/bin#NO SPACE
-INSTALLED_LIBPREFIX = $(INSTALLED_PREFIX)/lib#NO SPACE
+INSTALLED_LIBPREFIX = $(INSTALLED_PREFIX)/$(get_libdir)#NO SPACE
# chown installed tools to this user/group
# if you change anything here, make sure that the user/group can access
@@ -59,7 +59,7 @@
FORTRAN_INTERFACE = false#NO SPACE
# Instrument likwid-bench for use with likwid-perfctr
-INSTRUMENT_BENCH = false#NO SPACE
+INSTRUMENT_BENCH = true#NO SPACE
# Use recommended Portable Hardware Locality (hwloc) instead of CPUID
USE_HWLOC = true#NO SPACE
@@ -80,6 +80,6 @@
DATE = 19.05.2016
RPATHS = -Wl,-rpath=$(INSTALLED_LIBPREFIX)
-LIBLIKWIDPIN = $(abspath $(INSTALLED_PREFIX)/lib/liblikwidpin.so.$(VERSION).$(RELEASE))
+LIBLIKWIDPIN = $(abspath $(PREFIX)/$(get_libdir)/liblikwidpin.so)
LIKWIDFILTERPATH = $(abspath $(INSTALLED_PREFIX)/share/likwid/filter)
LIKWIDGROUPPATH = $(abspath $(INSTALLED_PREFIX)/share/likwid/perfgroups)

31
sys-apps/likwid/files/likwid-4.1.1-fix-gnustack.patch
View File

@@ -1,31 +0,0 @@
--- likwid-likwid-4.1.1/bench/Makefile.org 2015-08-22 13:56:17.242177531 +0800
+++ likwid-likwid-4.1.1/bench/Makefile 2015-08-22 13:56:46.985086094 +0800
@@ -118,6 +118,7 @@
$(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
+++ likwid-likwid-4.1.1/fix_gnustack.txt
@@ -0,0 +1,3 @@
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
--- likwid-likwid-4.1.1/src/loadData.S.org 2015-08-22 14:26:28.634629884 +0800
+++ likwid-likwid-4.1.1/src/loadData.S 2015-08-22 14:28:42.247210117 +0800
@@ -41,4 +41,6 @@
#endif
.size _loadData, .-_loadData
-
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif

19
sys-apps/likwid/files/likwid-4.1.2-Makefile.patch
View File

@@ -1,19 +0,0 @@
--- likwid-likwid-4.1.1/Makefile.org 2016-07-14 12:09:56.612963529 +0800
+++ likwid-likwid-4.1.1/Makefile 2016-07-14 12:11:24.148645584 +0800
@@ -51,7 +51,6 @@
#CONFIGURE BUILD SYSTEM
BUILD_DIR = ./$(COMPILER)
-Q ?= @
GENGROUPLOCK = .gengroup
VPATH = $(SRC_DIR)
@@ -544,7 +543,7 @@
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; \
chmod +x $$APP; \
done
- @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;
+ @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;
@sed -i -e "s+$(PREFIX)/share/likwid/mongroups+$(PWD)/monitoring/groups+g" likwid-agent
@ln -sf liblikwid.so liblikwid.so.$(VERSION)
@ln -sf ext/hwloc/liblikwid-hwloc.so liblikwid-hwloc.so.$(VERSION)

43
sys-apps/likwid/files/likwid-4.1.2-config.mk.patch
View File

@@ -1,43 +0,0 @@
--- likwid-likwid-4.1.1/config.mk.org 2016-07-14 12:49:27.791771509 +0800
+++ likwid-likwid-4.1.1/config.mk 2016-07-14 12:51:27.470358158 +0800
@@ -15,9 +15,9 @@
# Common users do not need to change values below this comment! #
#################################################################
-MANPREFIX = $(PREFIX)/man#NO SPACE
+MANPREFIX = ${D}/usr/share/man#NO SPACE
BINPREFIX = $(PREFIX)/bin#NO SPACE
-LIBPREFIX = $(PREFIX)/lib#NO SPACE
+LIBPREFIX = $(PREFIX)/$(get_libdir)#NO SPACE
# These paths are hardcoded into executables and libraries. Usually
# they'll be the same as above, but package maintainers may want to
@@ -26,9 +26,9 @@
# Keep in mind that the access and setFreq daemon need enough
# privileges that may be deleted when copying the files to
# the INTSTALLED_PREFIX
-INSTALLED_PREFIX = $(PREFIX)#NO SPACE
+INSTALLED_PREFIX=/usr#NO SPACE
INSTALLED_BINPREFIX = $(INSTALLED_PREFIX)/bin#NO SPACE
-INSTALLED_LIBPREFIX = $(INSTALLED_PREFIX)/lib#NO SPACE
+INSTALLED_LIBPREFIX = $(INSTALLED_PREFIX)/$(get_libdir)#NO SPACE
# chown installed tools to this user/group
# if you change anything here, make sure that the user/group can access
@@ -59,7 +59,7 @@
FORTRAN_INTERFACE = false#NO SPACE
# Instrument likwid-bench for use with likwid-perfctr
-INSTRUMENT_BENCH = false#NO SPACE
+INSTRUMENT_BENCH = true#NO SPACE
# Use recommended Portable Hardware Locality (hwloc) instead of CPUID
USE_HWLOC = true#NO SPACE
@@ -80,6 +80,6 @@
DATE = 19.05.2016
RPATHS = -Wl,-rpath=$(INSTALLED_LIBPREFIX)
-LIBLIKWIDPIN = $(abspath $(INSTALLED_PREFIX)/lib/liblikwidpin.so.$(VERSION).$(RELEASE))
+LIBLIKWIDPIN = $(abspath $(PREFIX)/$(get_libdir)/liblikwidpin.so)
LIKWIDFILTERPATH = $(abspath $(INSTALLED_PREFIX)/share/likwid/filter)
LIKWIDGROUPPATH = $(abspath $(INSTALLED_PREFIX)/share/likwid/perfgroups)

31
sys-apps/likwid/files/likwid-4.1.2-fix-gnustack.patch
View File

@@ -1,31 +0,0 @@
--- likwid-likwid-4.1.1/bench/Makefile.org 2015-08-22 13:56:17.242177531 +0800
+++ likwid-likwid-4.1.1/bench/Makefile 2015-08-22 13:56:46.985086094 +0800
@@ -118,6 +118,7 @@
$(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
+++ likwid-likwid-4.1.1/fix_gnustack.txt
@@ -0,0 +1,3 @@
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
--- likwid-likwid-4.1.1/src/loadData.S.org 2015-08-22 14:26:28.634629884 +0800
+++ likwid-likwid-4.1.1/src/loadData.S 2015-08-22 14:28:42.247210117 +0800
@@ -41,4 +41,6 @@
#endif
.size _loadData, .-_loadData
-
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif

97
sys-apps/likwid/likwid-4.1.1.ebuild
View File

@@ -1,97 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
FORTRAN_NEEDED=fortran
inherit fcaps linux-info fortran-2
DESCRIPTION="A performance-oriented tool suite for x86 multicore environments"
HOMEPAGE="https://github.com/rrze-likwid/likwid"
SRC_URI="https://github.com/RRZE-HPC/likwid/archive/likwid-4.1.1.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64"
IUSE="fortran"
RDEPEND="dev-lang/perl"
DEPEND="${RDEPEND}
fortran? ( sys-devel/gcc:*[fortran] )
dev-lang/lua:0"
CONFIG_CHECK="~X86_MSR"
FILECAPS=(
-M 755 cap_sys_rawio usr/sbin/likwid-accessD --
-M 755 cap_sys_rawio usr/bin/likwid-{perfctr,bench,powermeter}
)
# See Bug 558402
PATCHES=(
"${FILESDIR}/${P}-Makefile.patch"
"${FILESDIR}/${P}-fix-gnustack.patch"
"${FILESDIR}/${P}-config.mk.patch"
)
S=${WORKDIR}/likwid-likwid-${PV}
src_prepare() {
# Set PREFIX path to include sandbox path
sed -e 's:^PREFIX = .*:PREFIX = '${D}'/usr:' -i config.mk || die
# Set the path to library directory.
sed -e 's:$(get_libdir):'$(get_libdir)':' -i config.mk || die "Cannot set library path!"
# Set correct LDFLAGS
sed -e '/LIBS/aSHARED_LFLAGS += -Wl,-soname,$@' \
-i make/include_GCC.mk || die
# Insert date and version info man pages
sed -e 's/<DATE>/21.08.2015/g' \
-e "s/VERSION/${PV}/g" \
-i doc/*.1 || die
# Set path to the access daemon, once installed into the system
sed -e "/exeprog/s|TOSTRING(ACCESSDAEMON)|\"/usr/sbin/likwid-accessD\"|" \
-i src/access_client.c || die
# Ensure we build with a non executable stack
sed -e "s:CFLAGS += \$(SHARED_CFLAGS):CFLAGS += \$(SHARED_CFLAGS) -g -Wa,--noexecstack:" \
-i make/config_defines.mk || die
if use fortran; then
# If fortran USE is enabled, enable the fortran interfaces
sed -i 's:^FORTRAN_INTERFACE = false:FORTRAN_INTERFACE = likwid.mod:' config.mk || die
# Set the correct fortrant compiler for GCC
sed -i "s:^FC = ifort:FC = ${FC}:" make/include_GCC.mk || die
# Set the correct FCFLAGS for gcc fortran
sed -i '/^FCFLAGS/c\FCFLAGS = -J ./ -fsyntax-only' make/include_GCC.mk || die
fi
default
}
src_install () {
default
if use fortran; then
insinto /usr/include
doins likwid.mod
fi
doman doc/*.1
}
pkg_postinst() {
fcaps_pkg_postinst
ewarn "To enable users to access performance counters it is necessary to"
ewarn "change the access permissions to /dev/cpu/msr[0]* devices."
ewarn "It can be accomplished by adding the following line to file"
ewarn "/etc/udev/rules.d/99-myrules.rules: KERNEL==\"msr[0-9]*\" MODE=\"0666\""
}

104
sys-apps/likwid/likwid-4.1.2.ebuild
View File

@@ -1,104 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
FORTRAN_NEEDED=fortran
inherit fcaps linux-info toolchain-funcs fortran-2
DESCRIPTION="A performance-oriented tool suite for x86 multicore environments"
HOMEPAGE="https://github.com/rrze-likwid/likwid"
SRC_URI="https://ftp.fau.de/pub/likwid/${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64"
IUSE="fortran"
RDEPEND="dev-lang/perl"
DEPEND="${RDEPEND}
fortran? ( sys-devel/gcc:*[fortran] )
dev-lang/lua:0"
CONFIG_CHECK="~X86_MSR"
FILECAPS=(
-M 755 cap_sys_rawio usr/sbin/likwid-accessD --
-M 755 cap_sys_rawio usr/bin/likwid-{perfctr,bench,powermeter}
)
# See Bug 558402
PATCHES=(
"${FILESDIR}/${P}-Makefile.patch"
"${FILESDIR}/${P}-fix-gnustack.patch"
"${FILESDIR}/${P}-config.mk.patch"
)
src_prepare() {
# Set PREFIX path to include sandbox path
sed -e 's:^PREFIX = .*:PREFIX = '${D}'/usr:' -i config.mk || \
die "Failed to set correct prefix path"
# Set the path to library directory.
sed -e 's:$(get_libdir):'$(get_libdir)':' -i config.mk || \
die "Cannot set library path!"
# Set correct LDFLAGS
sed -e '/LIBS/aSHARED_LFLAGS += -Wl,-soname,$@' \
-i make/include_GCC.mk || die "Failed to set correct LDFLAGS"
# Insert date and version info man pages
sed -e 's/<DATE>/21.08.2015/g' \
-e "s/VERSION/${PV}/g" \
-i doc/*.1 || die "Failed to insert date into man pages"
# Set path to the access daemon, once installed into the system
sed -e "/exeprog/s|TOSTRING(ACCESSDAEMON)|\"/usr/sbin/likwid-accessD\"|" \
-i src/access_client.c || die "Failed to set access daemon path"
# Ensure we build with a non executable stack
sed -e "s:\$(SHARED_CFLAGS): \$(SHARED_CFLAGS) -Wa,--noexecstack:" \
-i make/config_defines.mk || die "Failed to set nonexecstack"
if use fortran; then
# If fortran USE is enabled, enable the fortran interfaces
sed -i 's:^FORTRAN_INTERFACE = false:FORTRAN_INTERFACE = likwid.mod:' \
config.mk || die "Enabling of fortran failed"
# Set the correct fortran compiler for GCC
sed -i "s:^FC = ifort:FC = ${FC}:" make/include_GCC.mk \
|| die "Failed to set fortran compiler"
# Set the correct FCFLAGS for gcc fortran
sed -i '/^FCFLAGS/c\FCFLAGS = -J ./ -fsyntax-only' make/include_GCC.mk \
|| die "Failed to set GCC flags for fortran"
fi
# Respect CC
sed -e "s:^CC.*:CC = $(tc-getCC):" \
-i make/include_GCC.mk || die
default
}
src_install () {
default
if use fortran; then
insinto /usr/include
doins likwid.mod
fi
doman doc/*.1
}
pkg_postinst() {
fcaps_pkg_postinst
ewarn "To enable users to access performance counters it is necessary to"
ewarn "change the access permissions to /dev/cpu/msr[0]* devices."
ewarn "It can be accomplished by adding the following line to file"
ewarn "/etc/udev/rules.d/99-myrules.rules: KERNEL==\"msr[0-9]*\" MODE=\"0666\""
}

8
sys-apps/likwid/metadata.xml
View File

@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
<remote-id type="github">rrze-likwid/likwid</remote-id>
</upstream>
</pkgmetadata>