diff options
| author |   Andreas Schäfer <gentryx@gmx.de> | 2014-02-19 02:22:39 +0100 |
|---|---|---|
| committer | Andreas Schäfer <gentryx@gmx.de> | 2014-02-19 02:22:39 +0100 |
| commit | a4fbcb6accadc4c31ef64abcfbee3845f42a242f (patch) | |
| tree | d561b0d448811103604ce95be23a5b3d7e630973 /sys-apps | |
| parent | merged sed commands into one (diff) | |
| download | sci-a4fbcb6accadc4c31ef64abcfbee3845f42a242f.tar.gz sci-a4fbcb6accadc4c31ef64abcfbee3845f42a242f.tar.bz2 sci-a4fbcb6accadc4c31ef64abcfbee3845f42a242f.zip | |
simplified path setting for access daemon
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/likwid/files/likwid-3.1.1-paths.patch | 7 | ||||
| -rw-r--r-- | 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 a5d28240d..79fa0ca72 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 9406a26da..5ce618e51 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 } |