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 ACE75138E20 for ; Fri, 21 Feb 2014 16:26:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 60F70E0F82; Fri, 21 Feb 2014 16:19:21 +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 43A5DE0F80 for ; Fri, 21 Feb 2014 16:19:20 +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 71C0433FA80 for ; Fri, 21 Feb 2014 16:19:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id D9373188C8 for ; Fri, 21 Feb 2014 16:19:17 +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: <1392772959.a4fbcb6accadc4c31ef64abcfbee3845f42a242f.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/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: a4fbcb6accadc4c31ef64abcfbee3845f42a242f X-VCS-Branch: master Date: Fri, 21 Feb 2014 16:19:17 +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: 5119d031-8b49-498f-851d-72f949716b8e X-Archives-Hash: e6fd00ef2df38290861f183158c829a5 commit: a4fbcb6accadc4c31ef64abcfbee3845f42a242f Author: Andreas Schäfer gmx de> AuthorDate: Wed Feb 19 01:22:39 2014 +0000 Commit: Justin Lecher gentoo 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 }