[gentoo-commits] repo/gentoo:master commit in: sys-apps/likwid/

2023-07-01 Thread Matthias Maier 
commit: 55121850326fa7c30ecacdb20c9bdff599732cc4
Author: Matthias Maier  gentoo  org>
AuthorDate: Sun Jul  2 05:17:48 2023 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Sun Jul  2 05:19:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55121850

sys-apps/likwid: add 5.2.2

Signed-off-by: Matthias Maier  gentoo.org>

 sys-apps/likwid/Manifest|   1 +
 sys-apps/likwid/likwid-5.2.2.ebuild | 147 
 2 files changed, 148 insertions(+)

diff --git a/sys-apps/likwid/Manifest b/sys-apps/likwid/Manifest
index 0ad4fd9fba92..1f8bdfdbd74f 100644
--- a/sys-apps/likwid/Manifest
+++ b/sys-apps/likwid/Manifest
@@ -1,2 +1,3 @@
 DIST likwid-4.3.4.tar.gz 1584829 BLAKE2B 
dcd1c3a0c5e549dc3d22bb98120339521e270da55460f5af9f2fe04849af0fe1ac4d9b881883a4efc3695ceb087d1afad5bcc55b55543199d2c33b0f5012cc68
 SHA512 
f1ee930a98d160728078a81a2cdc798ec62ac484545ced937131e6a6443e5ac23b8e597d31c7b1b9f67c1169e1c662c366cf1098158cb467d9f7ff12946b08a2
 DIST likwid-5.2.1.tar.gz 2308041 BLAKE2B 
1913212fb5157365a439757018ab58b4555e2b4401575ee05c784d038e13296644a7d0a89769599eef0444b13ed10f0357ad09b9cbae712f7d1fb9cca65fb1e3
 SHA512 
f096dcc071e976284c874aeb254dcb83c66ae808876a8c6be7b05e359d06800f1da25c01c072950c3493eb9ca10f6f9d81624feef61cc7a01f40fc0d003f98a7
+DIST likwid-5.2.2.tar.gz 2312420 BLAKE2B 
ceb5ee35fc266e6669f5a304bc222ae5fa598b76b0b2af9b37a214279033e8189f6c7726bdb41ad111f331a2fea52f6ff49cf190d7150b813ea651dbdc06d53f
 SHA512 
5949933341092a1ccb81add47771c8e5613c9faef8650d70ed8e7f81cee4e6d87bc6838686873bd6270f4cfef3fd57d8a69b067f943134e4ac08c14664105d0d

diff --git a/sys-apps/likwid/likwid-5.2.2.ebuild 
b/sys-apps/likwid/likwid-5.2.2.ebuild
new file mode 100644
index ..9e9d5ae85a94
--- /dev/null
+++ b/sys-apps/likwid/likwid-5.2.2.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FORTRAN_NEEDED=fortran
+
+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"
+
+CDEPEND="dev-lang/perl"
+
+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}"
+

[gentoo-commits] repo/gentoo:master commit in: sys-apps/likwid/

2022-06-02 Thread Matthias Maier 
commit: 1efac637754de80ed8bb6f397c16d44cfcc334c4
Author: Matthias Maier  gentoo  org>
AuthorDate: Fri Jun  3 04:26:53 2022 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Fri Jun  3 04:29:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1efac637

sys-apps/likwid: add 5.2.1

Closes: https://bugs.gentoo.org/800106
Closes: https://bugs.gentoo.org/808225
Closes: https://bugs.gentoo.org/822141
Closes: https://bugs.gentoo.org/828825
Signed-off-by: Matthias Maier  gentoo.org>

 sys-apps/likwid/Manifest|   1 +
 sys-apps/likwid/likwid-5.2.1.ebuild | 147 
 2 files changed, 148 insertions(+)

diff --git a/sys-apps/likwid/Manifest b/sys-apps/likwid/Manifest
index 16c593487b67..0ad4fd9fba92 100644
--- a/sys-apps/likwid/Manifest
+++ b/sys-apps/likwid/Manifest
@@ -1 +1,2 @@
 DIST likwid-4.3.4.tar.gz 1584829 BLAKE2B 
dcd1c3a0c5e549dc3d22bb98120339521e270da55460f5af9f2fe04849af0fe1ac4d9b881883a4efc3695ceb087d1afad5bcc55b55543199d2c33b0f5012cc68
 SHA512 
f1ee930a98d160728078a81a2cdc798ec62ac484545ced937131e6a6443e5ac23b8e597d31c7b1b9f67c1169e1c662c366cf1098158cb467d9f7ff12946b08a2
+DIST likwid-5.2.1.tar.gz 2308041 BLAKE2B 
1913212fb5157365a439757018ab58b4555e2b4401575ee05c784d038e13296644a7d0a89769599eef0444b13ed10f0357ad09b9cbae712f7d1fb9cca65fb1e3
 SHA512 
f096dcc071e976284c874aeb254dcb83c66ae808876a8c6be7b05e359d06800f1da25c01c072950c3493eb9ca10f6f9d81624feef61cc7a01f40fc0d003f98a7

diff --git a/sys-apps/likwid/likwid-5.2.1.ebuild 
b/sys-apps/likwid/likwid-5.2.1.ebuild
new file mode 100644
index ..ed2192fcf1bc
--- /dev/null
+++ b/sys-apps/likwid/likwid-5.2.1.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FORTRAN_NEEDED=fortran
+
+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"
+
+CDEPEND="dev-lang/perl"
+
+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[@]}" \
+

[gentoo-commits] repo/gentoo:master commit in: sys-apps/likwid/, profiles/

2020-12-07 Thread Marek Szuba 
commit: c44e033f4d003ae9d8cabadcb1a0ce142910cdbe
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Dec  7 12:20:22 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Dec  7 12:22:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c44e033f

sys-apps/likwid-4.3.4: migrate to lua-single.eclass

Supports lua5-2 and lua5-3 as per notes in the original ebuild, builds
fine against either.

Nb. on my system, even before the migration this ebuild only succeeds if
I force MAKEOPTS='-j1' - otherwise while linking likwid executables the
linker cannot find the package's own liblikwid.so.

Adding a separate package.mask line for migrated ebuilds because there
is still one ebuild in the tree which requires the package-wide mask.

Closes: https://bugs.gentoo.org/752858
Signed-off-by: Marek Szuba  gentoo.org>

 profiles/package.mask   |  1 +
 sys-apps/likwid/likwid-4.3.4.ebuild | 26 ++
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index fc7ad871a8d..c51c373378e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -594,6 +594,7 @@ gnome-base/orbit
 >=sci-libs/plplot-5.15.0-r100
 >=sci-visualization/gnuplot-5.4.0-r100
 >=sci-visualization/fityk-1.3.1-r100
+>=sys-apps/likwid-4.3.4
 >=www-apache/mod_security-2.9.3-r100
 >=www-client/elinks-0.13.5-r100
 >=www-client/luakit-2.2.1-r100

diff --git a/sys-apps/likwid/likwid-4.3.4.ebuild 
b/sys-apps/likwid/likwid-4.3.4.ebuild
index 02a836a19c6..914ca442fe6 100644
--- a/sys-apps/likwid/likwid-4.3.4.ebuild
+++ b/sys-apps/likwid/likwid-4.3.4.ebuild
@@ -1,31 +1,32 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 FORTRAN_NEEDED=fortran
+LUA_COMPAT=( lua5-{2..3} )
 #PYTHON_COMPAT=( python3_{6,7} )
 
 # 4.3.4 will need python-single-r1
-inherit fcaps fortran-2 linux-info toolchain-funcs
+inherit fcaps fortran-2 linux-info lua-single 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;
 
-# If this ebuild is changed to use the bundled Lua-5.3, then MIT should be
-# added to the LICENSE field.
 LICENSE="GPL-3+ BSD"
 
 SLOT="0"
 KEYWORDS="~amd64" # upstream partial support exists for x86 arm arm64
-IUSE="fortran" # ${PYTHON_REQUIRED_USE}
+IUSE="fortran"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}" # ${PYTHON_REQUIRED_USE}
 
 # lua:
 # likwid's primary functionality is driven by a set of lua scripts installed in
 # /usr/bin/
 # likwid bundles lua-5.3.2, AND supports using a system copy of lua-5.2 or
-# lua-5.3, which we use. This ebuild uses the system copy of Lua instead.
+# lua-5.3.
 #
 # hwloc:
 # likwid bundles a MODIFIED copy of hwloc-2.0.0a1 with specific configuration
@@ -41,7 +42,7 @@ IUSE="fortran" # ${PYTHON_REQUIRED_USE}
 # Python:
 # Python3 is used for one helper script, filter/json, added after 4.3.3
 CDEPEND="dev-lang/perl
-   dev-lang/lua:5.3"
+   ${LUA_DEPS}"
 
 # filter/json uses Python3
 RDEPEND="${CDEPEND}"
@@ -68,6 +69,7 @@ PATCHES=(
 
 pkg_setup() {
fortran-2_pkg_setup
+   lua-single_pkg_setup
#python-single-r1_pkg_setup
 }
 
@@ -104,8 +106,8 @@ export_emake_opts() {
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.
-   # TODO: support LUA_SINGLE_TARGET here later for Lua 5.2
-   local LUASLOT='5.3'
+   # WARNING: setting LUA_LIB_NAME=${ELUA} does *not* work with LuaJIT, 
keep this on mind
+   # should likwid upstream ever begin to support it.
# If the build is too loud, pass 'Q=@'
src_compile_opts=(
"Q="
@@ -118,9 +120,9 @@ export_emake_opts() {
"CC=$(tc-getCC)"
"ANSI_CFLAGS=${CFLAGS}"
"INSTRUMENT_BENCH=true"
-   "LUA_INCLUDE_DIR=/usr/include/lua${LUASLOT}"
-   "LUA_LIB_DIR=/usr/$(get_libdir)"
-   "LUA_LIB_NAME=lua${LUASLOT}"
+   "LUA_INCLUDE_DIR=$(lua_get_include_dir)"
+   "LUA_LIB_DIR=$(dirname "$(lua_get_shared_lib)")"
+   "LUA_LIB_NAME=${ELUA}"
"LUA_BIN=/usr/bin"
"FORTRAN_INTERFACE=$(usex fortran likwid.mod false)"
"FC=$(usex fortran "${FC}" false)"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/likwid/

2019-04-28 Thread Robin H. Johnson 
commit: 4b0ddd59e83ad16026b1ffce47d1b4978c2f806c
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Apr 28 21:01:08 2019 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Sun Apr 28 21:03:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b0ddd59

sys-apps/likwid: bump

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Robin H. Johnson  gentoo.org>

 sys-apps/likwid/Manifest|   1 +
 sys-apps/likwid/likwid-4.3.4.ebuild | 186 
 2 files changed, 187 insertions(+)

diff --git a/sys-apps/likwid/Manifest b/sys-apps/likwid/Manifest
index cc76505f29e..22f882da943 100644
--- a/sys-apps/likwid/Manifest
+++ b/sys-apps/likwid/Manifest
@@ -1 +1,2 @@
 DIST likwid-4.3.3.tar.gz 1579433 BLAKE2B 
9ec468bba009dec860b24c9c55c3d6023ffda3ab0985d835796686ba52d1d3372b2bfce926cf229388978de34e1ab0b41d8d27c88623c51c3e8ff1e9d674906b
 SHA512 
ae4d68e238bc40e4a4ab5df628561c9bb7a0ef8727d5779dba2c32fff0be1dd333532bee7e4c197e5fe286de81d35b863ef09f4bc8b9f9145360e6e461f3d94e
+DIST likwid-4.3.4.tar.gz 1584829 BLAKE2B 
dcd1c3a0c5e549dc3d22bb98120339521e270da55460f5af9f2fe04849af0fe1ac4d9b881883a4efc3695ceb087d1afad5bcc55b55543199d2c33b0f5012cc68
 SHA512 
f1ee930a98d160728078a81a2cdc798ec62ac484545ced937131e6a6443e5ac23b8e597d31c7b1b9f67c1169e1c662c366cf1098158cb467d9f7ff12946b08a2

diff --git a/sys-apps/likwid/likwid-4.3.4.ebuild 
b/sys-apps/likwid/likwid-4.3.4.ebuild
new file mode 100644
index 000..eba012a63db
--- /dev/null
+++ b/sys-apps/likwid/likwid-4.3.4.ebuild
@@ -0,0 +1,186 @@
+# 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;
+
+# If this ebuild is changed to use the bundled Lua-5.3, then MIT should be
+# added to the LICENSE field.
+LICENSE="GPL-3+ BSD"
+
+SLOT="0"
+KEYWORDS="~amd64" # upstream partial support exists for x86 arm arm64
+IUSE="fortran" # ${PYTHON_REQUIRED_USE}
+
+# lua:
+# likwid's primary functionality is driven by a set of lua scripts installed in
+# /usr/bin/
+# likwid bundles lua-5.3.2, AND supports using a system copy of lua-5.2 or
+# lua-5.3, which we use. This ebuild uses the system copy of Lua instead.
+#
+# hwloc:
+# likwid bundles a MODIFIED copy of hwloc-2.0.0a1 with specific configuration
+# for CPU probing & access
+#
+# Perl:
+# likwid uses Perl to convert from an internal text format to ASM listings
+# likwid also uses perl for some installed helper scripts
+# The build system bundles some Perl modules, that are not removed at this 
time:
+# Parse-RecDescent
+# Template
+#
+# Python:
+# Python3 is used for one helper script, filter/json, added after 4.3.3
+CDEPEND="dev-lang/perl
+   dev-lang/lua:5.3"
+
+# filter/json uses Python3
+RDEPEND="${CDEPEND}"
+   #${PYTHON_DEPS}"
+
+# Part of the build process depends on Data::Dumper
+#  perl-core/Data-Dumper"
+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"
+   # Old patches are obsolete:
+   #"${FILESDIR}/${PN}-4.3.1-Makefile.patch"
+   #"${FILESDIR}/${PN}-4.3.1-config.mk.patch"
+)
+
+pkg_setup() {
+   fortran-2_pkg_setup
+   #python-single-r1_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'
+

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

2019-03-25 Thread Robin H. Johnson 
commit: 996809d1fca2495641195e1d708bdbf962acc69c
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Mar 25 04:17:32 2019 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Mon Mar 25 17:31:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=996809d1

sys-apps/likwid: re-add package, with major cleanups

Includes some preparation for the next upstream release.

Package-Manager: Portage-2.3.62, Repoman-2.3.12
RepoMan-Options: --force
Signed-off-by: Robin H. Johnson  gentoo.org>

 sys-apps/likwid/Manifest   |   1 +
 .../likwid/files/likwid-4.3.1-fix-gnustack.patch   |  32 
 sys-apps/likwid/likwid-4.3.3.ebuild| 186 +
 sys-apps/likwid/metadata.xml   |  11 ++
 4 files changed, 230 insertions(+)

diff --git a/sys-apps/likwid/Manifest b/sys-apps/likwid/Manifest
new file mode 100644
index 000..cc76505f29e
--- /dev/null
+++ b/sys-apps/likwid/Manifest
@@ -0,0 +1 @@
+DIST likwid-4.3.3.tar.gz 1579433 BLAKE2B 
9ec468bba009dec860b24c9c55c3d6023ffda3ab0985d835796686ba52d1d3372b2bfce926cf229388978de34e1ab0b41d8d27c88623c51c3e8ff1e9d674906b
 SHA512 
ae4d68e238bc40e4a4ab5df628561c9bb7a0ef8727d5779dba2c32fff0be1dd333532bee7e4c197e5fe286de81d35b863ef09f4bc8b9f9145360e6e461f3d94e

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 000..c543a6ccd2d
--- /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 000..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.3.ebuild 
b/sys-apps/likwid/likwid-4.3.3.ebuild
new file mode 100644
index 000..05afdd52064
--- /dev/null
+++ b/sys-apps/likwid/likwid-4.3.3.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+FORTRAN_NEEDED=fortran
+#PYTHON_COMPAT=( python3_{4,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;
+
+# If this ebuild is changed to use the bundled Lua-5.3, then MIT should be
+# added to the LICENSE field.
+LICENSE="GPL-3+ BSD"
+
+SLOT="0"
+KEYWORDS="~amd64" # upstream partial support exists for x86 arm arm64
+IUSE="fortran" # ${PYTHON_REQUIRED_USE}
+
+# lua:
+# likwid's primary functionality is driven by a set of lua scripts installed in
+# /usr/bin/
+# likwid bundles lua-5.3.2, AND supports using a system copy of lua-5.2 or
+# lua-5.3, which we use. This ebuild uses the system copy of Lua instead.
+#
+# hwloc:
+# likwid bundles a MODIFIED copy of hwloc-2.0.0a1 with specific configuration
+# for CPU probing & access
+#
+# Perl:
+# likwid uses Perl to convert from an internal text format to ASM listings
+# likwid also uses perl for some installed helper scripts
+# The build system bundles some Perl modules, that are not removed at this 
time:
+# Parse-RecDescent
+# Template
+#
+# Python:
+# Python3 is used for one helper script, filter/json, added after 4.3.3
+CDEPEND="dev-lang/perl
+   dev-lang/lua:5.3"
+
+# filter/json uses Python3
+RDEPEND="${CDEPEND}"
+   #${PYTHON_DEPS}"
+
+# Part of the build process depends on Data::Dumper
+#  perl-core/Data-Dumper"
+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"
+   # Old patches are obsolete:
+   #"${FILESDIR}/${PN}-4.3.1-Makefile.patch"
+   #"${FILESDIR}/${PN}-4.3.1-config.mk.patch"
+)
+
+pkg_setup() {
+   fortran-2_pkg_setup
+   #python-single-r1_pkg_setup

[gentoo-commits] repo/gentoo:master commit in: sys-apps/likwid/

2018-04-15 Thread Patrice Clement 
commit: c5412a2d0af560cb8d0782de0c4244ac4bd780a3
Author: Patrice Clement  gentoo  org>
AuthorDate: Sun Apr 15 18:47:31 2018 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sun Apr 15 18:48:05 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5412a2d

sys-apps/likwid: remove maintainer.

Closes: https://bugs.gentoo.org/651824
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sys-apps/likwid/metadata.xml | 9 +
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/sys-apps/likwid/metadata.xml b/sys-apps/likwid/metadata.xml
index 9c00570418d..69f8f4152ad 100644
--- a/sys-apps/likwid/metadata.xml
+++ b/sys-apps/likwid/metadata.xml
@@ -1,14 +1,7 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   bren...@horan.hk
-   Brendan Horan
-   
-   
-   proxy-ma...@gentoo.org
-   Proxy Maintainers
-   
+   

rrze-likwid/likwid

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

2016-11-02 Thread Göktürk Yüksek 
commit: 08940377e37e95e56bbf73261763a26d712c9386
Author: Brendan Horan  horan  hk>
AuthorDate: Fri Oct 21 00:15:32 2016 +
Commit: Göktürk Yüksek  gentoo  org>
CommitDate: Wed Nov  2 15:53:04 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08940377

sys-apps/likwid: version bump to 4.1.2

Repoman OK
Patches apply OK
Addressed feedback

 sys-apps/likwid/Manifest   |   1 +
 sys-apps/likwid/files/likwid-4.1.2-Makefile.patch  |  19 
 sys-apps/likwid/files/likwid-4.1.2-config.mk.patch |  43 +
 .../likwid/files/likwid-4.1.2-fix-gnustack.patch   |  31 +++
 sys-apps/likwid/likwid-4.1.2.ebuild| 101 +
 5 files changed, 195 insertions(+)

diff --git a/sys-apps/likwid/Manifest b/sys-apps/likwid/Manifest
index 0c3bd6c..bb96efa 100644
--- a/sys-apps/likwid/Manifest
+++ b/sys-apps/likwid/Manifest
@@ -1 +1,2 @@
 DIST likwid-4.1.1.tar.gz 1395475 SHA256 
805b321c0c88e02ebddf89cd7e0097e40a438846cb033650c05a57d992393d3d SHA512 
2561cc8203bf795ebe661a0b2f2e15fb68a164438b2c839482bab67a82babadbcfd78aaf519c4ceab6cfc799a363216023f77fe744e3b302facf5c578d7ab407
 WHIRLPOOL 
5be6036e726296719effcd3fbd272168cdf5f2581ede0bca0c554098a780018063b6527cd99202a8620dcc705246f2da1ad281c573eacfee8b4310a8dccbd4d7
+DIST likwid-4.1.2.tar.gz 1398643 SHA256 
8a62a39ee584ec6b472d3791bf6c561af1db3e0564da7347c8a6cfdce8fd6763 SHA512 
efb6a85947193204e08ce32e79c5f3ef15c7babca66930145af1c2eca8eccc2aeceea54a12715467161c646acc208bda3d01d07ea365ff8bdb9eafb022f107d9
 WHIRLPOOL 
7e065169251c0f2f18a8634a9ff4d309984920070b842e2eb34bc478b540a9aa49f95ae7878a63d98d237f46be2273d20539e94a60f96946a0f88935e3643085

diff --git a/sys-apps/likwid/files/likwid-4.1.2-Makefile.patch 
b/sys-apps/likwid/files/likwid-4.1.2-Makefile.patch
new file mode 100644
index ..cec5d59
--- /dev/null
+++ b/sys-apps/likwid/files/likwid-4.1.2-Makefile.patch
@@ -0,0 +1,19 @@
+--- 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)/g" -e "s//$(DATE)/g" -e 
"s//$(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)/g" -e "s//$(DATE)/g" -e 
"s//$(RELEASE)/g" -e "s+$(PREFIX)/lib+$(PWD)+g" -e 
"s+$(PREFIX)/share/likwid/perfgroups+$(PWD)/groups+g" likwid.lua;
++  @sed -i -e "s//$(VERSION)/g" -e "s//$(DATE)/g" -e 
"s//$(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)

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
new file mode 100644
index ..36897e5
--- /dev/null
+++ b/sys-apps/likwid/files/likwid-4.1.2-config.mk.patch
@@ -0,0 +1,43 @@
+--- 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 =

[gentoo-commits] repo/gentoo:master commit in: sys-apps/likwid/

2016-11-02 Thread Göktürk Yüksek 
commit: 4b144e2682d22cd7a826eaee527b0b3e0725c064
Author: Göktürk Yüksek  gentoo  org>
AuthorDate: Wed Nov  2 15:52:34 2016 +
Commit: Göktürk Yüksek  gentoo  org>
CommitDate: Wed Nov  2 16:08:52 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b144e26

sys-apps/likwid: respect CC

Package-Manager: portage-2.2.28

 sys-apps/likwid/likwid-4.1.2.ebuild | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sys-apps/likwid/likwid-4.1.2.ebuild 
b/sys-apps/likwid/likwid-4.1.2.ebuild
index 6566777..a20b746 100644
--- a/sys-apps/likwid/likwid-4.1.2.ebuild
+++ b/sys-apps/likwid/likwid-4.1.2.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 
 FORTRAN_NEEDED=fortran
 
-inherit fcaps linux-info fortran-2
+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;
@@ -78,6 +78,10 @@ src_prepare() {
|| 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
 
 }

[gentoo-commits] repo/gentoo:master commit in: sys-apps/likwid/

2016-07-19 Thread Amy Winston 
commit: 22a1e5b0ffb9dee347174ad75df59b149b41bf00
Author: Amy Winston  gentoo  org>
AuthorDate: Tue Jul 19 16:54:00 2016 +
Commit: Amy Winston  gentoo  org>
CommitDate: Tue Jul 19 16:54:00 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22a1e5b0

sys-apps/likwid: fix license, unused inherits removed

Package-Manager: portage-2.2.28

 sys-apps/likwid/likwid-4.1.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/likwid/likwid-4.1.1.ebuild 
b/sys-apps/likwid/likwid-4.1.1.ebuild
index c7f11c8..5cb4ba7 100644
--- a/sys-apps/likwid/likwid-4.1.1.ebuild
+++ b/sys-apps/likwid/likwid-4.1.1.ebuild
@@ -6,13 +6,13 @@ EAPI=6
 
 FORTRAN_NEEDED=fortran
 
-inherit eutils fcaps linux-info multilib fortran-2
+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"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="fortran"

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

2016-07-19 Thread Amy Winston 
commit: 025b9960bc77949539e5b6f6baf2918ef09b12a2
Author: Amy Winston  gentoo  org>
AuthorDate: Tue Jul 19 09:38:36 2016 +
Commit: Amy Winston  gentoo  org>
CommitDate: Tue Jul 19 09:38:36 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=025b9960

sys-apps/likwid: version bump 4.1.1 bug #588830. Brendan Horan

Package-Manager: portage-2.2.28

 sys-apps/likwid/Manifest   |  1 +
 sys-apps/likwid/files/likwid-4.1.1-Makefile.patch  | 19 +
 sys-apps/likwid/files/likwid-4.1.1-config.mk.patch | 43 ++
 .../likwid/files/likwid-4.1.1-fix-gnustack.patch   | 31 +++
 sys-apps/likwid/likwid-4.1.1.ebuild| 98 ++
 5 files changed, 192 insertions(+)

diff --git a/sys-apps/likwid/Manifest b/sys-apps/likwid/Manifest
index 2b503e5..87d5a9b 100644
--- a/sys-apps/likwid/Manifest
+++ b/sys-apps/likwid/Manifest
@@ -1,2 +1,3 @@
 DIST likwid-3.1.3.tar.gz 605675 SHA256 
05078ec55dce3d4cf1c94832bd289ccbcaee7bdee9a1ea9f6681ccd3f59ece5b SHA512 
e31b4498e702d4ddf61e3c123d43f0804ef4cef149bb3732b61e3894aa9d76feb7a2654bbb0467dd30323031122ea01cf17e4f01a33f193e750cdbdfc09741d7
 WHIRLPOOL 
bccfcc68e792f09a66eab99affa81250fbe34d4759a81a4e0bd0af2535e5bb09229bee4bc165986559d14101183e5be9a933273ec9f1a7c5c8da3f97f07f9e8e
 DIST likwid-4.0.1.tar.gz 1409079 SHA256 
ab384e585d99a7404075c48f78a08e892a75db12c348da6622ed0536a0a05c7f SHA512 
f164a244e56afdc4409790b75f3cb4ea49cc91f7a210590de426f429db5717eed9691263580008cf69997be56a63009224012ee48c55f05b112f96cfca81c52e
 WHIRLPOOL 
59392e6a2057fb9f9aa70b7cc0594ca7a665171b8a2302ddd9350930571596f14e5c9753d132eddb750ef8503330b4f456158fae7a99705c36e7aac80afa6bb2
+DIST likwid-4.1.1.tar.gz 1395475 SHA256 
805b321c0c88e02ebddf89cd7e0097e40a438846cb033650c05a57d992393d3d SHA512 
2561cc8203bf795ebe661a0b2f2e15fb68a164438b2c839482bab67a82babadbcfd78aaf519c4ceab6cfc799a363216023f77fe744e3b302facf5c578d7ab407
 WHIRLPOOL 
5be6036e726296719effcd3fbd272168cdf5f2581ede0bca0c554098a780018063b6527cd99202a8620dcc705246f2da1ad281c573eacfee8b4310a8dccbd4d7

diff --git a/sys-apps/likwid/files/likwid-4.1.1-Makefile.patch 
b/sys-apps/likwid/files/likwid-4.1.1-Makefile.patch
new file mode 100644
index 000..cec5d59
--- /dev/null
+++ b/sys-apps/likwid/files/likwid-4.1.1-Makefile.patch
@@ -0,0 +1,19 @@
+--- 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)/g" -e "s//$(DATE)/g" -e 
"s//$(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)/g" -e "s//$(DATE)/g" -e 
"s//$(RELEASE)/g" -e "s+$(PREFIX)/lib+$(PWD)+g" -e 
"s+$(PREFIX)/share/likwid/perfgroups+$(PWD)/groups+g" likwid.lua;
++  @sed -i -e "s//$(VERSION)/g" -e "s//$(DATE)/g" -e 
"s//$(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)

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
new file mode 100644
index 000..36897e5
--- /dev/null
+++ b/sys-apps/likwid/files/likwid-4.1.1-config.mk.patch
@@ -0,0 +1,43 @@
+--- 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

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

2016-07-19 Thread Amy Winston 
commit: 773af2b3d89eab8d088f8f597588abf3342b369b
Author: Amy Winston  gentoo  org>
AuthorDate: Tue Jul 19 09:41:48 2016 +
Commit: Amy Winston  gentoo  org>
CommitDate: Tue Jul 19 09:41:48 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=773af2b3

sys-apps/likwid: remove old. Brendan Horan.

Package-Manager: portage-2.2.28

 sys-apps/likwid/Manifest   |  2 -
 sys-apps/likwid/files/likwid-3.1.3-Makefile.patch  | 42 -
 .../likwid/files/likwid-3.1.3-fix-gnustack.patch   | 32 ---
 sys-apps/likwid/files/likwid-4.0.1-Makefile.patch  | 39 -
 .../likwid/files/likwid-4.0.1-access-daemon.patch  | 11 ---
 sys-apps/likwid/files/likwid-4.0.1-config.mk.patch | 46 --
 .../likwid/files/likwid-4.0.1-fix-gnustack.patch   | 31 ---
 .../likwid/files/likwid-4.0.1-lua-makefile.patch   | 19 -
 sys-apps/likwid/likwid-3.1.3.ebuild| 67 ---
 sys-apps/likwid/likwid-4.0.1-r2.ebuild | 99 --
 10 files changed, 388 deletions(-)

diff --git a/sys-apps/likwid/Manifest b/sys-apps/likwid/Manifest
index 87d5a9b..0c3bd6c 100644
--- a/sys-apps/likwid/Manifest
+++ b/sys-apps/likwid/Manifest
@@ -1,3 +1 @@
-DIST likwid-3.1.3.tar.gz 605675 SHA256 
05078ec55dce3d4cf1c94832bd289ccbcaee7bdee9a1ea9f6681ccd3f59ece5b SHA512 
e31b4498e702d4ddf61e3c123d43f0804ef4cef149bb3732b61e3894aa9d76feb7a2654bbb0467dd30323031122ea01cf17e4f01a33f193e750cdbdfc09741d7
 WHIRLPOOL 
bccfcc68e792f09a66eab99affa81250fbe34d4759a81a4e0bd0af2535e5bb09229bee4bc165986559d14101183e5be9a933273ec9f1a7c5c8da3f97f07f9e8e
-DIST likwid-4.0.1.tar.gz 1409079 SHA256 
ab384e585d99a7404075c48f78a08e892a75db12c348da6622ed0536a0a05c7f SHA512 
f164a244e56afdc4409790b75f3cb4ea49cc91f7a210590de426f429db5717eed9691263580008cf69997be56a63009224012ee48c55f05b112f96cfca81c52e
 WHIRLPOOL 
59392e6a2057fb9f9aa70b7cc0594ca7a665171b8a2302ddd9350930571596f14e5c9753d132eddb750ef8503330b4f456158fae7a99705c36e7aac80afa6bb2
 DIST likwid-4.1.1.tar.gz 1395475 SHA256 
805b321c0c88e02ebddf89cd7e0097e40a438846cb033650c05a57d992393d3d SHA512 
2561cc8203bf795ebe661a0b2f2e15fb68a164438b2c839482bab67a82babadbcfd78aaf519c4ceab6cfc799a363216023f77fe744e3b302facf5c578d7ab407
 WHIRLPOOL 
5be6036e726296719effcd3fbd272168cdf5f2581ede0bca0c554098a780018063b6527cd99202a8620dcc705246f2da1ad281c573eacfee8b4310a8dccbd4d7

diff --git a/sys-apps/likwid/files/likwid-3.1.3-Makefile.patch 
b/sys-apps/likwid/files/likwid-3.1.3-Makefile.patch
deleted file mode 100644
index a40d0c3..000
--- a/sys-apps/likwid/files/likwid-3.1.3-Makefile.patch
+++ /dev/null
@@ -1,42 +0,0 @@
 Makefile.org   2015-03-04 16:25:59.942213571 +0800
-+++ Makefile   2015-03-04 16:46:05.640278082 +0800
-@@ -87,7 +87,7 @@
- 
- LIKWID_LIB = liblikwid
- ifeq ($(SHARED_LIBRARY),true)
--CFLAGS += $(SHARED_CFLAGS) -ggdb
-+CFLAGS += $(SHARED_CFLAGS) -g -Wa,--noexecstack
- DYNAMIC_TARGET_LIB := $(LIKWID_LIB).so
- TARGET_LIB := $(DYNAMIC_TARGET_LIB)
- LIBS += -L. -llikwid
-@@ -307,28 +307,8 @@
-   echo "Only root can adjust the privileges of the daemon 
applications in $(PREFIX)/sbin"; \
-   fi; \
-   done
--  @echo "===> INSTALL man pages to $(MANPREFIX)/man1"
--  @mkdir -p $(MANPREFIX)/man1
--  @sed -e "s//$(VERSION)/g" -e "s//$(DATE)/g" < 
$(DOC_DIR)/likwid-topology.1 > $(MANPREFIX)/man1/likwid-topology.1
--  @sed -e "s//$(VERSION)/g" -e "s//$(DATE)/g" < 
$(DOC_DIR)/likwid-features.1 > $(MANPREFIX)/man1/likwid-features.1
--  @sed -e "s//$(VERSION)/g" -e "s//$(DATE)/g" < 
$(DOC_DIR)/likwid-perfctr.1 > $(MANPREFIX)/man1/likwid-perfctr.1
--  @sed -e "s//$(VERSION)/g" -e "s//$(DATE)/g" < 
$(DOC_DIR)/likwid-powermeter.1 > $(MANPREFIX)/man1/likwid-powermeter.1
--  @sed -e "s//$(VERSION)/g" -e "s//$(DATE)/g" < 
$(DOC_DIR)/likwid-pin.1 > $(MANPREFIX)/man1/likwid-pin.1
--  @sed -e "s//$(VERSION)/g" -e "s//$(DATE)/g" < 
$(DOC_DIR)/likwid-setFrequencies.1 > $(MANPREFIX)/man1/likwid-setFrequencies.1
--  @sed -e "s//$(VERSION)/g" -e "s//$(DATE)/g" < 
$(DOC_DIR)/likwid-bench.1 > $(MANPREFIX)/man1/likwid-bench.1
--  @sed -e "s//$(VERSION)/g" -e "s//$(DATE)/g" < 
$(DOC_DIR)/feedGnuplot.1 > $(MANPREFIX)/man1/feedGnuplot.1
--  @sed -e "s//$(VERSION)/g" -e "s//$(DATE)/g" < 
$(DOC_DIR)/likwid-accessD.1 > $(MANPREFIX)/man1/likwid-accessD.1
--  @sed -e "s//$(VERSION)/g" -e "s//$(DATE)/g" < 
$(DOC_DIR)/likwid-genCfg.1 > $(MANPREFIX)/man1/likwid-genCfg.1
--  @sed -e "s//$(VERSION)/g" -e "s//$(DATE)/g" < 
$(DOC_DIR)/likwid-memsweeper.1 > $(MANPREFIX)/man1/likwid-memsweeper.1
--  @sed -e "s//$(VERSION)/g" -e "s//$(DATE)/g" < 
$(DOC_DIR)/likwid-mpirun.1 > $(MANPREFIX)/man1/likwid-mpirun.1
--  @sed -e "s//$(VERSION)/g" -e "s//$(DATE)/g" < 
$(DOC_DIR)/likwid-perfscope.1 > $(MANPREFIX)/man1/likwid-perfscope.1
--  @sed -e "s//$(VERSION)/g" -e "s//$(DATE)/g" < 
$(DOC_DIR)/likwid-setFreq.1 > $(MANPREFIX)/man1/likwid-setFreq.1
--

[gentoo-commits] repo/gentoo:master commit in: sys-apps/likwid/

2016-05-11 Thread Sam Jorna 
commit: 68e7d18fc6a90751f83a8862e8eff084ccc66087
Author: Sam Jorna  gentoo  org>
AuthorDate: Thu May 12 01:13:24 2016 +
Commit: Sam Jorna  gentoo  org>
CommitDate: Thu May 12 01:13:55 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68e7d18f

sys-apps/likwid: revbump, fix file perms

Fixes incorrect permissions on installed binaries. Patch by proxied
maintainer per bug.

Gentoo-bug: 582692
Package-Manager: portage-2.2.28

 sys-apps/likwid/{likwid-4.0.1-r1.ebuild => likwid-4.0.1-r2.ebuild} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys-apps/likwid/likwid-4.0.1-r1.ebuild 
b/sys-apps/likwid/likwid-4.0.1-r2.ebuild
similarity index 94%
rename from sys-apps/likwid/likwid-4.0.1-r1.ebuild
rename to sys-apps/likwid/likwid-4.0.1-r2.ebuild
index 3e884ee..7d68628 100644
--- a/sys-apps/likwid/likwid-4.0.1-r1.ebuild
+++ b/sys-apps/likwid/likwid-4.0.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -29,8 +29,8 @@ RESTRICT="mirror"
 CONFIG_CHECK="~X86_MSR"
 
 FILECAPS=(
-   cap_sys_rawio usr/sbin/likwid-accessD --
-   cap_sys_rawio usr/bin/likwid-{perfctr,bench,powermeter}
+   -M 755 cap_sys_rawio usr/sbin/likwid-accessD --
+   -M 755 cap_sys_rawio usr/bin/likwid-{perfctr,bench,powermeter}
 )
 
 S=${WORKDIR}/likwid-likwid-${PV}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/likwid/

2016-04-20 Thread Ian Delaney 
commit: 80926eb278f951627f71b72ec1d841766f282f7e
Author: Brendan Horan  horan  hk>
AuthorDate: Tue Apr 19 23:37:12 2016 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Wed Apr 20 09:14:14 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80926eb2

sys-apps/likwid : remove sed dep

Removed unneeded dependency sys-apps/sed from DEPEND
Closes: https://github.com/gentoo/gentoo/pull/1311

Signed-off-by: Ian Delaney  gentoo.org>

 sys-apps/likwid/likwid-4.0.1-r1.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sys-apps/likwid/likwid-4.0.1-r1.ebuild 
b/sys-apps/likwid/likwid-4.0.1-r1.ebuild
index 11e04c2..3e884ee 100644
--- a/sys-apps/likwid/likwid-4.0.1-r1.ebuild
+++ b/sys-apps/likwid/likwid-4.0.1-r1.ebuild
@@ -21,7 +21,6 @@ IUSE="fortran"
 RDEPEND="dev-lang/perl"
 
 DEPEND="${RDEPEND}
-   sys-apps/sed
fortran? ( sys-devel/gcc:*[fortran] )
dev-lang/lua:0"

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

2015-11-16 Thread Ian Delaney 
commit: fbcefa3e84142dec0d95f60095ca09f9f64034e7
Author: Ian Delaney  gentoo  org>
AuthorDate: Tue Nov 17 07:14:00 2015 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Tue Nov 17 07:14:48 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbcefa3e

sys-apps/likwid: revbump to vn. 4.0.1-r1, sourced from gentoo bug

Patches, ack to user Libor Bukata, final patches by proxy maintainer
sourced from the gentoo bug used for initial version bump to likwid-4.0.1
likwid-4.0.1-access-daemon.patch added to reset perms and set libdir
correctly at install phase, rm broken 4.0.1 ebuild

Gentoo bug: # 558402

Package-Manager: portage-2.2.24

 sys-apps/likwid/files/likwid-4.0.1-access-daemon.patch | 11 +++
 .../likwid/{likwid-4.0.1.ebuild => likwid-4.0.1-r1.ebuild} | 14 +-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/sys-apps/likwid/files/likwid-4.0.1-access-daemon.patch 
b/sys-apps/likwid/files/likwid-4.0.1-access-daemon.patch
new file mode 100644
index 000..2652f24
--- /dev/null
+++ b/sys-apps/likwid/files/likwid-4.0.1-access-daemon.patch
@@ -0,0 +1,11 @@
+--- src/configuration.c.orig   2015-11-14 09:10:58.283075033 +0100
 src/configuration.c2015-11-14 09:11:14.898074670 +0100
+@@ -68,7 +68,7 @@
+ use_hardcoded:
+ ret = sprintf(filename,"%s", TOSTRING(ACCESSDAEMON));
+ filename[ret] = '\0';
+-if (!access(filename, R_OK))
++if (!access(filename, X_OK))
+ {
+ config.daemonPath = (char*)malloc((strlen(filename)+1) * 
sizeof(char));
+ strcpy(config.daemonPath, filename);

diff --git a/sys-apps/likwid/likwid-4.0.1.ebuild 
b/sys-apps/likwid/likwid-4.0.1-r1.ebuild
similarity index 80%
rename from sys-apps/likwid/likwid-4.0.1.ebuild
rename to sys-apps/likwid/likwid-4.0.1-r1.ebuild
index 0c25cb3..11e04c2 100644
--- a/sys-apps/likwid/likwid-4.0.1.ebuild
+++ b/sys-apps/likwid/likwid-4.0.1-r1.ebuild
@@ -41,11 +41,15 @@ src_prepare() {
epatch "${FILESDIR}"/${P}-Makefile.patch \
"${FILESDIR}"/${P}-fix-gnustack.patch \
"${FILESDIR}"/${P}-lua-makefile.patch \
-   "${FILESDIR}"/${P}-config.mk.patch
+   "${FILESDIR}"/${P}-config.mk.patch \
+   "${FILESDIR}"/${P}-access-daemon.patch
 
# 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
@@ -86,3 +90,11 @@ src_install () {
 
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\""
+}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/likwid/

2015-09-07 Thread Ian Delaney 
commit: 2d143ddb0ff0564220c26e0151a48ea9df779727
Author: Ian Delaney  gentoo  org>
AuthorDate: Tue Sep  8 01:35:36 2015 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Tue Sep  8 01:35:36 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d143ddb

sys-apps/likwid: set SRC_URI to devspace, fixes bug #559522

Package-Manager: portage-2.2.20

 sys-apps/likwid/Manifest| 2 +-
 sys-apps/likwid/likwid-4.0.1.ebuild | 5 -
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sys-apps/likwid/Manifest b/sys-apps/likwid/Manifest
index 448cb7b..2b503e5 100644
--- a/sys-apps/likwid/Manifest
+++ b/sys-apps/likwid/Manifest
@@ -1,2 +1,2 @@
 DIST likwid-3.1.3.tar.gz 605675 SHA256 
05078ec55dce3d4cf1c94832bd289ccbcaee7bdee9a1ea9f6681ccd3f59ece5b SHA512 
e31b4498e702d4ddf61e3c123d43f0804ef4cef149bb3732b61e3894aa9d76feb7a2654bbb0467dd30323031122ea01cf17e4f01a33f193e750cdbdfc09741d7
 WHIRLPOOL 
bccfcc68e792f09a66eab99affa81250fbe34d4759a81a4e0bd0af2535e5bb09229bee4bc165986559d14101183e5be9a933273ec9f1a7c5c8da3f97f07f9e8e
-DIST likwid-4.0.1.tar.gz 1429223 SHA256 
c04551a2264389f4a88cb2757efdcb0a8d3c3fd9851020d0827a90b68b8c36e3 SHA512 
fdc0eaf102814d53efdabb12d90f4baeec9d190f9808e3fcf5a6785136a7cf9fd0789cf64417cd52c7288a50a4284f8e44463c16410c2b0e4ef3ce3790c61b86
 WHIRLPOOL 
9a944b77ebb60d5283c2c42c44dabeb6dc8837d64a4e2d90d0878ab60c5b3b3d7e55cbfbbe7fcc075edcc83d4d980f689a8ed6b5f3a5051c6af824d624b1dbd6
+DIST likwid-4.0.1.tar.gz 1409079 SHA256 
ab384e585d99a7404075c48f78a08e892a75db12c348da6622ed0536a0a05c7f SHA512 
f164a244e56afdc4409790b75f3cb4ea49cc91f7a210590de426f429db5717eed9691263580008cf69997be56a63009224012ee48c55f05b112f96cfca81c52e
 WHIRLPOOL 
59392e6a2057fb9f9aa70b7cc0594ca7a665171b8a2302ddd9350930571596f14e5c9753d132eddb750ef8503330b4f456158fae7a99705c36e7aac80afa6bb2

diff --git a/sys-apps/likwid/likwid-4.0.1.ebuild 
b/sys-apps/likwid/likwid-4.0.1.ebuild
index 52c115c..0c25cb3 100644
--- a/sys-apps/likwid/likwid-4.0.1.ebuild
+++ b/sys-apps/likwid/likwid-4.0.1.ebuild
@@ -10,7 +10,8 @@ inherit eutils fcaps linux-info multilib 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-likwid/likwid/archive/likwid-${PV}.tar.gz;
+# Upstream have made a habit of making changes to the tagged realesed tarball
+SRC_URI="https://dev.gentoo.org/~idella4/tarballs/likwid-${PV}.tar.gz;
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -24,6 +25,8 @@ DEPEND="${RDEPEND}
fortran? ( sys-devel/gcc:*[fortran] )
dev-lang/lua:0"
 
+RESTRICT="mirror"
+
 CONFIG_CHECK="~X86_MSR"
 
 FILECAPS=(

[gentoo-commits] repo/gentoo:master commit in: sys-apps/likwid/

2015-09-01 Thread Tobias Klausmann 
commit: 8beb92bc34200ac73e5ca5060020eb932c9478e7
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Tue Sep  1 19:59:23 2015 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Tue Sep  1 19:59:23 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8beb92bc

sys-apps/likwid: Fixing HOMEPAGE move due to code.google.com shutdown

Package-Manager: portage-2.2.20.1

 sys-apps/likwid/likwid-3.1.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/likwid/likwid-3.1.3.ebuild 
b/sys-apps/likwid/likwid-3.1.3.ebuild
index f938441..5ecba88 100644
--- a/sys-apps/likwid/likwid-3.1.3.ebuild
+++ b/sys-apps/likwid/likwid-3.1.3.ebuild
@@ -9,7 +9,7 @@ FORTRAN_NEEDED=fortran
 inherit eutils fcaps fortran-2 linux-info multilib
 
 DESCRIPTION="A lightweight performance-oriented tool suite for x86 multicore 
environments"
-HOMEPAGE="https://code.google.com/p/likwid/;
+HOMEPAGE="https://github.com/rrze-likwid/likwid;
 SRC_URI="http://ftp.fau.de/pub/likwid/likwid-${PV}.tar.gz;
 
 LICENSE="GPL-3"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/likwid/

2015-08-25 Thread Matt Thode 
commit: 661cfafc23970f580a744d24574855f2346333fe
Author: Brendan Horan brendan AT horan DOT hk
AuthorDate: Wed Aug 26 01:19:05 2015 +
Commit: Matt Thode prometheanfire AT gentoo DOT org
CommitDate: Wed Aug 26 03:20:11 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=661cfafc

sys-apps/likwid: Upstream re-submitted the tarball with altered content. See 
bug 558664.

Signed-off-by: Matthew Thode prometheanfire AT gentoo.org

 sys-apps/likwid/likwid-4.0.1.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys-apps/likwid/likwid-4.0.1.ebuild 
b/sys-apps/likwid/likwid-4.0.1.ebuild
index 8016266..52c115c 100644
--- a/sys-apps/likwid/likwid-4.0.1.ebuild
+++ b/sys-apps/likwid/likwid-4.0.1.ebuild
@@ -31,6 +31,8 @@ FILECAPS=(
cap_sys_rawio usr/bin/likwid-{perfctr,bench,powermeter}
 )
 
+S=${WORKDIR}/likwid-likwid-${PV}
+
 src_prepare() {
# See Bug 558402
epatch ${FILESDIR}/${P}-Makefile.patch \

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

2015-08-24 Thread Ian Delaney 
commit: 10cd91a253aeb95771eb745363414685b3a78c9a
Author: Ian Delaney idella4 AT gentoo DOT org
AuthorDate: Mon Aug 24 16:22:24 2015 +
Commit: Ian Delaney idella4 AT gentoo DOT org
CommitDate: Mon Aug 24 16:22:24 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10cd91a2

sys-apps/likwid: bump; new patches supporting changes

All patches by maintainer (undersys), fixes bug #558402

Package-Manager: portage-2.2.20

 sys-apps/likwid/Manifest   |  1 +
 sys-apps/likwid/files/likwid-4.0.1-Makefile.patch  | 39 ++
 sys-apps/likwid/files/likwid-4.0.1-config.mk.patch | 46 
 .../likwid/files/likwid-4.0.1-fix-gnustack.patch   | 31 
 .../likwid/files/likwid-4.0.1-lua-makefile.patch   | 19 +
 sys-apps/likwid/likwid-4.0.1.ebuild| 83 ++
 sys-apps/likwid/metadata.xml   |  2 +-
 7 files changed, 220 insertions(+), 1 deletion(-)

diff --git a/sys-apps/likwid/Manifest b/sys-apps/likwid/Manifest
index e8f7a48..448cb7b 100644
--- a/sys-apps/likwid/Manifest
+++ b/sys-apps/likwid/Manifest
@@ -1 +1,2 @@
 DIST likwid-3.1.3.tar.gz 605675 SHA256 
05078ec55dce3d4cf1c94832bd289ccbcaee7bdee9a1ea9f6681ccd3f59ece5b SHA512 
e31b4498e702d4ddf61e3c123d43f0804ef4cef149bb3732b61e3894aa9d76feb7a2654bbb0467dd30323031122ea01cf17e4f01a33f193e750cdbdfc09741d7
 WHIRLPOOL 
bccfcc68e792f09a66eab99affa81250fbe34d4759a81a4e0bd0af2535e5bb09229bee4bc165986559d14101183e5be9a933273ec9f1a7c5c8da3f97f07f9e8e
+DIST likwid-4.0.1.tar.gz 1429223 SHA256 
c04551a2264389f4a88cb2757efdcb0a8d3c3fd9851020d0827a90b68b8c36e3 SHA512 
fdc0eaf102814d53efdabb12d90f4baeec9d190f9808e3fcf5a6785136a7cf9fd0789cf64417cd52c7288a50a4284f8e44463c16410c2b0e4ef3ce3790c61b86
 WHIRLPOOL 
9a944b77ebb60d5283c2c42c44dabeb6dc8837d64a4e2d90d0878ab60c5b3b3d7e55cbfbbe7fcc075edcc83d4d980f689a8ed6b5f3a5051c6af824d624b1dbd6

diff --git a/sys-apps/likwid/files/likwid-4.0.1-Makefile.patch 
b/sys-apps/likwid/files/likwid-4.0.1-Makefile.patch
new file mode 100644
index 000..4601922
--- /dev/null
+++ b/sys-apps/likwid/files/likwid-4.0.1-Makefile.patch
@@ -0,0 +1,39 @@
+--- Makefile.org   2015-08-24 10:58:52.694430235 +0800
 Makefile   2015-08-24 10:54:27.11154 +0800
+@@ -51,7 +51,6 @@
+ 
+ #CONFIGURE BUILD SYSTEM
+ BUILD_DIR  = ./$(COMPILER)
+-Q ?= @
+ GENGROUPLOCK = .gengroup
+ 
+ VPATH = $(SRC_DIR)
+@@ -285,21 +284,6 @@
+   @cd $(LIBPREFIX)  ln -fs liblikwidpin.so.$(VERSION) liblikwidpin.so
+   @cd $(LIBPREFIX)  ln -fs $(shell basename 
$(TARGET_HWLOC_LIB)).$(VERSION) $(shell basename $(TARGET_HWLOC_LIB))
+   @cd $(LIBPREFIX)  ln -fs $(shell basename 
$(TARGET_LUA_LIB)).$(VERSION) $(shell basename $(TARGET_LUA_LIB))
+-  @echo === INSTALL man pages to $(MANPREFIX)/man1
+-  @mkdir -p $(MANPREFIX)/man1
+-  @sed -e s/VERSION/$(VERSION)/g -e s/DATE/$(DATE)/g  
$(DOC_DIR)/likwid-topology.1  $(MANPREFIX)/man1/likwid-topology.1
+-  @sed -e s/VERSION/$(VERSION)/g -e s/DATE/$(DATE)/g  
$(DOC_DIR)/likwid-features.1  $(MANPREFIX)/man1/likwid-features.1
+-  @sed -e s/VERSION/$(VERSION)/g -e s/DATE/$(DATE)/g -e 
s+PREFIX+$(PREFIX)+g  $(DOC_DIR)/likwid-perfctr.1  
$(MANPREFIX)/man1/likwid-perfctr.1
+-  @sed -e s/VERSION/$(VERSION)/g -e s/DATE/$(DATE)/g  
$(DOC_DIR)/likwid-powermeter.1  $(MANPREFIX)/man1/likwid-powermeter.1
+-  @sed -e s/VERSION/$(VERSION)/g -e s/DATE/$(DATE)/g  
$(DOC_DIR)/likwid-pin.1  $(MANPREFIX)/man1/likwid-pin.1
+-  @sed -e s/VERSION/$(VERSION)/g -e s/DATE/$(DATE)/g  
$(DOC_DIR)/feedGnuplot.1  $(MANPREFIX)/man1/feedGnuplot.1
+-  @sed -e s/VERSION/$(VERSION)/g -e s/DATE/$(DATE)/g  
$(DOC_DIR)/likwid-accessD.1  $(MANPREFIX)/man1/likwid-accessD.1
+-  @sed -e s/VERSION/$(VERSION)/g -e s/DATE/$(DATE)/g  
$(DOC_DIR)/likwid-genTopoCfg.1  $(MANPREFIX)/man1/likwid-genTopoCfg.1
+-  @sed -e s/VERSION/$(VERSION)/g -e s/DATE/$(DATE)/g  
$(DOC_DIR)/likwid-memsweeper.1  $(MANPREFIX)/man1/likwid-memsweeper.1
+-  @sed -e s/VERSION/$(VERSION)/g -e s/DATE/$(DATE)/g  
$(DOC_DIR)/likwid-mpirun.1  $(MANPREFIX)/man1/likwid-mpirun.1
+-  @sed -e s/VERSION/$(VERSION)/g -e s/DATE/$(DATE)/g  
$(DOC_DIR)/likwid-perfscope.1  $(MANPREFIX)/man1/likwid-perfscope.1
+-  @sed -e s/VERSION/$(VERSION)/g -e s/DATE/$(DATE)/g  
$(DOC_DIR)/likwid-setFreq.1  $(MANPREFIX)/man1/likwid-setFreq.1
+-  @chmod 644 $(MANPREFIX)/man1/likwid-*
+   @echo === INSTALL headers to $(PREFIX)/include
+   @mkdir -p $(PREFIX)/include
+   @install -m 644 src/includes/likwid.h  $(PREFIX)/include/
+@@ -363,6 +347,6 @@
+   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+ $$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