From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 81761138E20 for ; Fri, 21 Feb 2014 16:26:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A2800E0ED3; Fri, 21 Feb 2014 16:19:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F3B60E0ECB for ; Fri, 21 Feb 2014 16:19:17 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 01C7833F692 for ; Fri, 21 Feb 2014 16:19:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 6E9DC18874 for ; Fri, 21 Feb 2014 16:19:15 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1392767594.07af85a43a3b677e6fef933d9b58892296757987.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sys-apps/likwid/, sys-apps/likwid/files/ X-VCS-Repository: proj/sci X-VCS-Files: sys-apps/likwid/files/likwid-3.1.1-paths.patch sys-apps/likwid/files/likwid-3.1.1-shared_lib.patch sys-apps/likwid/likwid-3.1.1.ebuild X-VCS-Directories: sys-apps/likwid/ sys-apps/likwid/files/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 07af85a43a3b677e6fef933d9b58892296757987 X-VCS-Branch: master Date: Fri, 21 Feb 2014 16:19:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 88067df6-3b0f-4b19-9692-874fd5c2cacc X-Archives-Hash: d9d4d450ae2a00bd10b32d20056bc78e commit: 07af85a43a3b677e6fef933d9b58892296757987 Author: Andreas Schäfer gmx de> AuthorDate: Tue Feb 18 23:53:14 2014 +0000 Commit: Justin Lecher gentoo 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_.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 +}