* [gentoo-commits] proj/sci:master commit in: sys-apps/likwid/, sys-apps/likwid/files/
@ 2014-02-21 16:19 Justin Lecher
0 siblings, 0 replies; 3+ messages in thread
From: Justin Lecher @ 2014-02-21 16:19 UTC (permalink / raw
To: gentoo-commits
commit: 07af85a43a3b677e6fef933d9b58892296757987
Author: Andreas Schäfer <gentryx <AT> gmx <DOT> de>
AuthorDate: Tue Feb 18 23:53:14 2014 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Feb 18 23:53:14 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=07af85a4
added ebuild/patches for likwid-3.1.1
---
sys-apps/likwid/files/likwid-3.1.1-paths.patch | 27 ++++++++++++++++++
.../likwid/files/likwid-3.1.1-shared_lib.patch | 12 ++++++++
sys-apps/likwid/likwid-3.1.1.ebuild | 33 ++++++++++++++++++++++
3 files changed, 72 insertions(+)
diff --git a/sys-apps/likwid/files/likwid-3.1.1-paths.patch b/sys-apps/likwid/files/likwid-3.1.1-paths.patch
new file mode 100644
index 0000000..202970e
--- /dev/null
+++ b/sys-apps/likwid/files/likwid-3.1.1-paths.patch
@@ -0,0 +1,27 @@
+diff -ru likwid-3.1.1/config.mk likwid-3.1.1-nju/config.mk
+--- likwid-3.1.1/config.mk 2014-02-12 17:14:16.000000000 +0100
++++ likwid-3.1.1-nju/config.mk 2014-02-19 00:22:02.530917183 +0100
+@@ -10,12 +10,12 @@
+
+ # Path were to install likwid
+ PREFIX = /usr/local#NO SPACE
+-MANPREFIX = $(PREFIX)/man#NO SPACE
++MANPREFIX = $(PREFIX)/share/man#NO SPACE
+
+ # For the daemon based secure msr/pci access configure
+ # the absolute path to the msr daemon executable.
+ # $(PREFIX)/bin/likwid-accessD
+-ACCESSDAEMON = $(PREFIX)/bin/likwid-accessD#NO SPACE
++ACCESSDAEMON = /usr/bin/likwid-accessD#NO SPACE
+
+ # Build the accessDaemon. Have a look in the WIKI for details.
+ BUILDDAEMON = true#NO SPACE
+@@ -26,7 +26,7 @@
+ ACCESSMODE = accessdaemon#NO SPACE
+
+ # Change to true to a build shared library instead of a static one
+-SHARED_LIBRARY = false#NO SPACE
++SHARED_LIBRARY = true#NO SPACE
+
+ # Build Fortran90 module interface for marker API. Adopt Fortran compiler
+ # in ./make/include_<COMPILER>.mk if necessary. Default: ifort .
diff --git a/sys-apps/likwid/files/likwid-3.1.1-shared_lib.patch b/sys-apps/likwid/files/likwid-3.1.1-shared_lib.patch
new file mode 100644
index 0000000..6499fa2
--- /dev/null
+++ b/sys-apps/likwid/files/likwid-3.1.1-shared_lib.patch
@@ -0,0 +1,12 @@
+diff -ru likwid-3.1.1-nju/Makefile likwid-3.1.1-njv/Makefile
+--- likwid-3.1.1-nju/Makefile 2014-02-19 00:20:55.620918453 +0100
++++ likwid-3.1.1-njv/Makefile 2014-02-19 00:47:28.250888224 +0100
+@@ -184,7 +184,7 @@
+
+ $(APPS): $(addprefix $(SRC_DIR)/applications/,$(addsuffix .c,$(APPS))) $(BUILD_DIR) $(GENGROUPLOCK) $(OBJ) $(OBJ_BENCH)
+ @echo "===> LINKING $@"
+- $(Q)${CC} $(CFLAGS) $(ANSI_CFLAGS) $(CPPFLAGS) ${LFLAGS} -o $@ $(addprefix $(SRC_DIR)/applications/,$(addsuffix .c,$@)) $(OBJ_BENCH) $(STATIC_TARGET_LIB) $(LIBS)
++ $(Q)${CC} $(CFLAGS) $(ANSI_CFLAGS) $(CPPFLAGS) ${LFLAGS} -o $@ $(addprefix $(SRC_DIR)/applications/,$(addsuffix .c,$@)) $(OBJ_BENCH) $(STATIC_TARGET_LIB) $(DYNAMIC_TARGET_LIB) $(LIBS)
+
+ $(STATIC_TARGET_LIB): $(OBJ)
+ @echo "===> CREATE STATIC LIB $(STATIC_TARGET_LIB)"
diff --git a/sys-apps/likwid/likwid-3.1.1.ebuild b/sys-apps/likwid/likwid-3.1.1.ebuild
new file mode 100644
index 0000000..dd1f0b0
--- /dev/null
+++ b/sys-apps/likwid/likwid-3.1.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Command line tools for developing high performance multi threaded programs"
+HOMEPAGE="http://code.google.com/p/likwid/"
+SRC_URI="http://likwid.googlecode.com/files/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~amd64"
+IUSE="uncore"
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-paths.patch"
+ epatch "${FILESDIR}/${P}-shared_lib.patch"
+ use uncore && epatch "${FILESDIR}/use_uncore.patch"
+ sed -i -e "s:/usr/local:${D}/usr:" config.mk || die "Couldn't set prefix!"
+}
+
+src_compile() {
+ default
+ emake likwid-bench
+}
+
+src_install() {
+ default
+ fperms 4755 /usr/bin/likwid-accessD
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] proj/sci:master commit in: sys-apps/likwid/, sys-apps/likwid/files/
@ 2014-02-21 16:19 Justin Lecher
0 siblings, 0 replies; 3+ messages in thread
From: Justin Lecher @ 2014-02-21 16:19 UTC (permalink / raw
To: gentoo-commits
commit: d69a48d998c1353030585d6c17ee6377189bb508
Author: Andreas Schäfer <gentryx <AT> gmx <DOT> de>
AuthorDate: Wed Feb 19 00:47:41 2014 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Feb 19 00:47:41 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d69a48d9
switched to saner prefix for access daemon
---
sys-apps/likwid/files/likwid-3.1.1-paths.patch | 2 +-
sys-apps/likwid/likwid-3.1.1.ebuild | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/sys-apps/likwid/files/likwid-3.1.1-paths.patch b/sys-apps/likwid/files/likwid-3.1.1-paths.patch
index 202970e..a5d2824 100644
--- a/sys-apps/likwid/files/likwid-3.1.1-paths.patch
+++ b/sys-apps/likwid/files/likwid-3.1.1-paths.patch
@@ -12,7 +12,7 @@ diff -ru likwid-3.1.1/config.mk likwid-3.1.1-nju/config.mk
# the absolute path to the msr daemon executable.
# $(PREFIX)/bin/likwid-accessD
-ACCESSDAEMON = $(PREFIX)/bin/likwid-accessD#NO SPACE
-+ACCESSDAEMON = /usr/bin/likwid-accessD#NO SPACE
++ACCESSDAEMON = PREFIX_MARKER/likwid-accessD#NO SPACE
# Build the accessDaemon. Have a look in the WIKI for details.
BUILDDAEMON = true#NO SPACE
diff --git a/sys-apps/likwid/likwid-3.1.1.ebuild b/sys-apps/likwid/likwid-3.1.1.ebuild
index b23bb71..d9876b2 100644
--- a/sys-apps/likwid/likwid-3.1.1.ebuild
+++ b/sys-apps/likwid/likwid-3.1.1.ebuild
@@ -18,6 +18,7 @@ IUSE=""
src_prepare() {
epatch "${FILESDIR}/${P}-paths.patch"
epatch "${FILESDIR}/${P}-shared_lib.patch"
+ sed -i -e "s:PREFIX_MARKER:${EPREFIX}/usr/bin:" config.mk || die "Couldn't replace daemon dir!"
sed -i -e "s:/usr/local:${ED}/usr:" config.mk || die "Couldn't set prefix!"
}
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] proj/sci:master commit in: sys-apps/likwid/, sys-apps/likwid/files/
@ 2014-02-21 16:19 Justin Lecher
0 siblings, 0 replies; 3+ messages in thread
From: Justin Lecher @ 2014-02-21 16:19 UTC (permalink / raw
To: gentoo-commits
commit: a4fbcb6accadc4c31ef64abcfbee3845f42a242f
Author: Andreas Schäfer <gentryx <AT> gmx <DOT> de>
AuthorDate: Wed Feb 19 01:22:39 2014 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Feb 19 01:22:39 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a4fbcb6a
simplified path setting for access daemon
---
sys-apps/likwid/files/likwid-3.1.1-paths.patch | 7 +------
sys-apps/likwid/likwid-3.1.1.ebuild | 4 ++--
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/sys-apps/likwid/files/likwid-3.1.1-paths.patch b/sys-apps/likwid/files/likwid-3.1.1-paths.patch
index a5d2824..79fa0ca 100644
--- a/sys-apps/likwid/files/likwid-3.1.1-paths.patch
+++ b/sys-apps/likwid/files/likwid-3.1.1-paths.patch
@@ -1,7 +1,7 @@
diff -ru likwid-3.1.1/config.mk likwid-3.1.1-nju/config.mk
--- likwid-3.1.1/config.mk 2014-02-12 17:14:16.000000000 +0100
+++ likwid-3.1.1-nju/config.mk 2014-02-19 00:22:02.530917183 +0100
-@@ -10,12 +10,12 @@
+@@ -10,8 +10,8 @@
# Path were to install likwid
PREFIX = /usr/local#NO SPACE
@@ -11,11 +11,6 @@ diff -ru likwid-3.1.1/config.mk likwid-3.1.1-nju/config.mk
# For the daemon based secure msr/pci access configure
# the absolute path to the msr daemon executable.
# $(PREFIX)/bin/likwid-accessD
--ACCESSDAEMON = $(PREFIX)/bin/likwid-accessD#NO SPACE
-+ACCESSDAEMON = PREFIX_MARKER/likwid-accessD#NO SPACE
-
- # Build the accessDaemon. Have a look in the WIKI for details.
- BUILDDAEMON = true#NO SPACE
@@ -26,7 +26,7 @@
ACCESSMODE = accessdaemon#NO SPACE
diff --git a/sys-apps/likwid/likwid-3.1.1.ebuild b/sys-apps/likwid/likwid-3.1.1.ebuild
index 9406a26..5ce618e 100644
--- a/sys-apps/likwid/likwid-3.1.1.ebuild
+++ b/sys-apps/likwid/likwid-3.1.1.ebuild
@@ -18,11 +18,11 @@ IUSE=""
src_prepare() {
epatch "${FILESDIR}/${P}-paths.patch"
epatch "${FILESDIR}/${P}-shared_lib.patch"
- sed -i -e "s:PREFIX_MARKER:${EPREFIX}/usr/bin:" -e "s:/usr/local:${ED}/usr:" config.mk || die "Couldn't set directories!"
+ sed -i -e "s:/usr/local:${ED}/usr:" config.mk || die "Couldn't set directories!"
}
src_compile() {
- default
+ emake PREFIX="${EPREFIX}/usr"
emake likwid-bench
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-02-21 16:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-02-21 16:19 [gentoo-commits] proj/sci:master commit in: sys-apps/likwid/, sys-apps/likwid/files/ Justin Lecher
-- strict thread matches above, loose matches on Subject: below --
2014-02-21 16:19 Justin Lecher
2014-02-21 16:19 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox