[gentoo-commits] repo/dev/tamiko:master commit in: sys-apps/likwid/files/, sys-apps/likwid/

[Matthias Maier]

commit:     b509733e3a93ec709fcc15e85afcf0fea67f89c9
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 31 04:47:52 2019 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Thu Oct 31 04:47:52 2019 +0000
URL:        https://gitweb.gentoo.org/repo/dev/tamiko.git/commit/?id=b509733e

sys-apps/likwid: add package and use bundled lua

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 sys-apps/likwid/Manifest                           |   1 +
 .../likwid/files/likwid-4.3.1-fix-gnustack.patch   |  32 +++++
 sys-apps/likwid/likwid-4.3.4-r50.ebuild            | 151 +++++++++++++++++++++
 sys-apps/likwid/metadata.xml                       |  11 ++
 4 files changed, 195 insertions(+)

diff --git a/sys-apps/likwid/Manifest b/sys-apps/likwid/Manifest
new file mode 100644
index 0000000..4b7da33
--- /dev/null
+++ b/sys-apps/likwid/Manifest
@@ -0,0 +1 @@
+DIST likwid-4.3.4.tar.gz 1584829 SHA256 5c0d1c66b25dac8292a02232f06454067f031a238f010c62f40ef913c6609a83 SHA512 f1ee930a98d160728078a81a2cdc798ec62ac484545ced937131e6a6443e5ac23b8e597d31c7b1b9f67c1169e1c662c366cf1098158cb467d9f7ff12946b08a2 WHIRLPOOL 956070af7bd2893bfe8bbd994d44ba783795916f3f70e0253501e798b2cc4880a77a541c4089749decd4fd4ba14e7170c3404096b334377ac6caa322d1ed8aaa

diff --git a/sys-apps/likwid/files/likwid-4.3.1-fix-gnustack.patch b/sys-apps/likwid/files/likwid-4.3.1-fix-gnustack.patch
new file mode 100644
index 0000000..c543a6c
--- /dev/null
+++ b/sys-apps/likwid/files/likwid-4.3.1-fix-gnustack.patch
@@ -0,0 +1,32 @@
+--- likwid-likwid-4.3.1/bench/Makefile.org	2018-02-26 14:03:17.706837535 +0800
++++ likwid-likwid-4.3.1/bench/Makefile	2018-02-26 14:04:19.427195208 +0800
+@@ -115,6 +115,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.3.1/src/loadData.S.org	2018-02-26 14:06:16.418872121 +0800
++++ likwid-likwid-4.3.1/src/loadData.S	2018-02-26 14:19:03.281289307 +0800
+@@ -41,4 +41,6 @@
+ #endif
+ .size _loadData, .-_loadData
+ 
+-
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+

diff --git a/sys-apps/likwid/likwid-4.3.4-r50.ebuild b/sys-apps/likwid/likwid-4.3.4-r50.ebuild
new file mode 100644
index 0000000..59693e7
--- /dev/null
+++ b/sys-apps/likwid/likwid-4.3.4-r50.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+FORTRAN_NEEDED=fortran
+#PYTHON_COMPAT=( python3_{5,6,7} )
+
+# 4.3.4 will need python-single-r1
+inherit fcaps fortran-2 linux-info toolchain-funcs
+
+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+ BSD MIT"
+
+SLOT="0"
+KEYWORDS="~amd64" # upstream partial support exists for x86 arm arm64
+IUSE="fortran" # ${PYTHON_REQUIRED_USE}
+
+CDEPEND="dev-lang/perl"
+
+# filter/json uses Python3
+RDEPEND="${CDEPEND}"
+
+DEPEND="${CDEPEND}"
+
+CONFIG_CHECK="~X86_MSR"
+
+FILECAPS=(
+	-M 755 cap_sys_rawio+ep usr/sbin/likwid-accessD
+	--
+	-M 755 cap_sys_rawio+ep usr/sbin/likwid-setFreq
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.3.1-fix-gnustack.patch"
+)
+
+pkg_setup() {
+	fortran-2_pkg_setup
+}
+
+src_prepare() {
+	# Ensure we build with a non executable stack
+	sed \
+		-e '/^SHARED_CFLAGS/s/$/ -Wa,--noexecstack/' \
+		-i make/include_{GCC*,CLANG}.mk \
+		|| die "Failed to set nonexecstack"
+
+	# Make the install targets respect Q= for being quiet or not
+	# MUCH easier for debugging
+	sed -r \
+		-e '/^install/,/^[a-z]/{/^\t@/{ s/@/$(Q)/; }}' \
+		-i \
+		Makefile || die "Failed to sed Makefile"
+
+	sed -i \
+		-e '/^\.NOTPARALLEL:/d' \
+		Makefile \
+		bench/Makefile \
+		ext/hwloc/Makefile || die "Failed to re-enable parallel"
+
+	default
+}
+
+export_emake_opts() {
+	# Warning: this build system uses PREFIX in a way that differs from
+	# autoconf! It's more like:
+	# PREFIX=$(DESTDIR)$(INSTALLED_PREFIX)
+	# it's not 100% like that, because parts of the Makefiles are inconsistent.
+	# this is the same solution used in the upstream RPM specs
+	# these variables are uppercase so they match what's put into Make.
+	local INSTALLED_PREFIX=/usr
+	local INSTALLED_LIBPREFIX=/usr/$(get_libdir) # upstream is '$(INSTALLED_PREFIX)/lib'
+	local INSTALLED_MANPREFIX=/usr/share/man # upstream has it as used but undefined variable.
+	# If the build is too loud, pass 'Q=@'
+	src_compile_opts=(
+		"Q="
+		"INSTALLED_PREFIX=${INSTALLED_PREFIX}"
+		"INSTALLED_LIBPREFIX=${INSTALLED_LIBPREFIX}"
+		"INSTALLED_MANPREFIX=${INSTALLED_MANPREFIX}"
+		"PREFIX=${INSTALLED_PREFIX}"
+		"LIBPREFIX=${INSTALLED_LIBPREFIX}"
+		"MANPREFIX=${INSTALLED_MANPREFIX}"
+		"CC=$(tc-getCC)"
+		"ANSI_CFLAGS=${CFLAGS}"
+		"INSTRUMENT_BENCH=true"
+		"FORTRAN_INTERFACE=$(usex fortran likwid.mod false)"
+		"FC=$(usex fortran "${FC}" false)"
+		"FCFLAGS=-J ./ -fsyntax-only" # needed for building correctly
+	)
+	src_install_opts=(
+		"PREFIX=${D}${INSTALLED_PREFIX}"
+		"LIBPREFIX=${D}${INSTALLED_LIBPREFIX}"
+		"MANPREFIX=${D}${INSTALLED_MANPREFIX}"
+	)
+}
+
+src_compile() {
+	export_emake_opts
+	emake \
+		"${src_compile_opts[@]}" \
+		|| die 'emake failed'
+}
+
+src_install () {
+	export_emake_opts
+	emake \
+		"${src_compile_opts[@]}" \
+		"${src_install_opts[@]}" \
+		DESTDIR="${D}" \
+		install || die 'emake install failed'
+
+	use fortran && doheader likwid.mod
+
+	# Fix Python filter added shortly after 4.3.3
+	#python_fix_shebang "${D}"/usr/share/likwid/filter/
+
+	# Do NOT use 'doman'! The upstream 'make install' target does a sed as it's
+	# generating the final manpage to the real install dir; and the copies in
+	# ${S} are unmodified.
+	dodoc README.md CHANGELOG doc/logo.png
+	dodoc doc/*.txt
+	dodoc doc/*.md
+	dodoc -r doc/applications doc/archs
+	# Fix upstream partial doc install
+	rm -rf "${D}"/usr/share/likwid/docs || die
+	ln -sf "/usr/share/doc/${PF}" "${D}"/usr/share/likwid/docs || die
+}
+
+pkg_preinst() {
+	# This is now a symlink, but used to be a plain directory
+	OLDDOCDIR=/usr/share/likwid/docs
+	if [[ ! -L "${OLDDOCDIR}" && -d "${OLDDOCDIR}" ]]; then
+		einfo "Cleaning up old docdir at ${OLDDOCDIR}"
+		rm -rf "${OLDDOCDIR}" || die
+	fi
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+	einfo "If you get 'Cannot gather values from MSR_PLATFORM_INFO', then 'modprobe msr'!"
+	einfo
+	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\""
+	ewarn "Alternatively, assign the MSR files to a unique group and use mode 0660"
+}

diff --git a/sys-apps/likwid/metadata.xml b/sys-apps/likwid/metadata.xml
new file mode 100644
index 0000000..3a16425
--- /dev/null
+++ b/sys-apps/likwid/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>robbat2@g.o</email>
+		<name>Robin H. Johnson</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">rrze-likwid/likwid</remote-id>
+	</upstream>
+</pkgmetadata>