diff options
author | Anthony G. Basile <blueness@gentoo.org> | 2012-12-01 18:20:27 +0000 |
---|---|---|
committer | Anthony G. Basile <blueness@gentoo.org> | 2012-12-01 18:20:27 +0000 |
commit | 1227775f872ec1cd73f64d71ba9c18e52fdb2d51 (patch) | |
tree | 732babb6caa61f0fd1402a513f9de5dfd931b40c | |
parent | Re-add ~alpha wrt #432974 (diff) | |
download | gentoo-2-1227775f872ec1cd73f64d71ba9c18e52fdb2d51.tar.gz gentoo-2-1227775f872ec1cd73f64d71ba9c18e52fdb2d51.tar.bz2 gentoo-2-1227775f872ec1cd73f64d71ba9c18e52fdb2d51.zip |
Switch to EAPI=4
(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
-rw-r--r-- | app-benchmarks/ramspeed/ChangeLog | 5 | ||||
-rw-r--r-- | app-benchmarks/ramspeed/ramspeed-3.5.0-r1.ebuild | 24 |
2 files changed, 14 insertions, 15 deletions
diff --git a/app-benchmarks/ramspeed/ChangeLog b/app-benchmarks/ramspeed/ChangeLog index 69b1687c6545..ded89f467f29 100644 --- a/app-benchmarks/ramspeed/ChangeLog +++ b/app-benchmarks/ramspeed/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-benchmarks/ramspeed # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/ramspeed/ChangeLog,v 1.8 2012/12/01 18:02:23 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/ramspeed/ChangeLog,v 1.9 2012/12/01 18:20:27 blueness Exp $ + + 01 Dec 2012; Anthony G. Basile <blueness@gentoo.org> ramspeed-3.5.0-r1.ebuild: + Switch to EAPI=4 01 Dec 2012; Anthony G. Basile <blueness@gentoo.org> ramspeed-2.6.0.ebuild, ramspeed-3.5.0.ebuild: diff --git a/app-benchmarks/ramspeed/ramspeed-3.5.0-r1.ebuild b/app-benchmarks/ramspeed/ramspeed-3.5.0-r1.ebuild index fb759f958138..f7497dbe2426 100644 --- a/app-benchmarks/ramspeed/ramspeed-3.5.0-r1.ebuild +++ b/app-benchmarks/ramspeed/ramspeed-3.5.0-r1.ebuild @@ -1,12 +1,13 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/ramspeed/ramspeed-3.5.0-r1.ebuild,v 1.2 2012/12/01 17:57:38 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/ramspeed/ramspeed-3.5.0-r1.ebuild,v 1.3 2012/12/01 18:20:27 blueness Exp $ -EAPI=2 +EAPI="4" inherit flag-o-matic toolchain-funcs MY_PN="ramsmp" -MY_P=${MY_PN}-${PV} +MY_P="${MY_PN}-${PV}" +S="${WORKDIR}/${MY_P}" DESCRIPTION="Benchmarking for memory and cache" HOMEPAGE="http://www.alasir.com/software/ramspeed/" @@ -17,13 +18,6 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="sse pic" -src_prepare(){ - tc-export CC AS - - # Deal with changed package name and file name - mv ${MY_P} ${P} -} - src_configure(){ local obj local arch_prefix=./ @@ -31,6 +25,8 @@ src_configure(){ use x86 && arch_prefix=i386/ use amd64 && arch_prefix=amd64/ + tc-export CC AS + #fix the stack append-ldflags -Wl,-z,noexecstack obj=( ramsmp.o ${arch_prefix}{fltmark,fltmem,intmark,intmem}.o ) @@ -57,11 +53,11 @@ src_configure(){ obj=( "${obj[@]}" ${arch_prefix}{mmxmark,mmxmem,ssemark,ssemem}.o ) fi - echo "ramsmp: ${obj[@]}" > Makefile || die + echo "ramsmp: ${obj[@]}" > Makefile } src_install(){ - dobin ramsmp || die - dosym /usr/bin/ramsmp /usr/bin/ramspeed || die - dodoc HISTORY README || die + dobin ramsmp + dosym /usr/bin/ramsmp /usr/bin/ramspeed + dodoc HISTORY README } |