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 5156F138E3F for ; Fri, 21 Feb 2014 16:26:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CA0A2E0F86; 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 99D9AE0F7E 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 99AA733FA90 for ; Fri, 21 Feb 2014 16:19:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id BA70C188CD for ; Fri, 21 Feb 2014 16:19:16 +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: <1392770861.d69a48d998c1353030585d6c17ee6377189bb508.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: d69a48d998c1353030585d6c17ee6377189bb508 X-VCS-Branch: master Date: Fri, 21 Feb 2014 16:19:16 +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: 71cb5ed2-854c-4b6a-b30f-71e6f6b1ed4f X-Archives-Hash: 5188f766947790de1dff3e0cfe18b46c commit: d69a48d998c1353030585d6c17ee6377189bb508 Author: Andreas Schäfer gmx de> AuthorDate: Wed Feb 19 00:47:41 2014 +0000 Commit: Justin Lecher gentoo 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!" }