diff options
| author |   Anthony G. Basile <blueness@gentoo.org> | 2012-12-01 18:02:23 +0000 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2012-12-01 18:02:23 +0000 |
| commit | bf52706e796109a52ce7122b8143de8d04205c2f (patch) | |
| tree | 48d95b559f46b5e3444d68bdd77a254059a4db85 /app-benchmarks | |
| parent | alpha/ia64/sparc stable wrt #434300 (diff) | |
| download | gentoo-2-bf52706e796109a52ce7122b8143de8d04205c2f.tar.gz gentoo-2-bf52706e796109a52ce7122b8143de8d04205c2f.tar.bz2 gentoo-2-bf52706e796109a52ce7122b8143de8d04205c2f.zip | |
Restore to non-pic friendly versions, they should never have been changed
(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Diffstat (limited to 'app-benchmarks')
| -rw-r--r-- | app-benchmarks/ramspeed/ChangeLog | 6 | ||||
| -rw-r--r-- | app-benchmarks/ramspeed/ramspeed-2.6.0.ebuild | 9 | ||||
| -rw-r--r-- | app-benchmarks/ramspeed/ramspeed-3.5.0.ebuild | 9 |
3 files changed, 9 insertions, 15 deletions
diff --git a/app-benchmarks/ramspeed/ChangeLog b/app-benchmarks/ramspeed/ChangeLog index 07f5809a8f6a..69b1687c6545 100644 --- a/app-benchmarks/ramspeed/ChangeLog +++ b/app-benchmarks/ramspeed/ChangeLog @@ -1,6 +1,10 @@ # 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.7 2012/12/01 17:57:38 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/ramspeed/ChangeLog,v 1.8 2012/12/01 18:02:23 blueness Exp $ + + 01 Dec 2012; Anthony G. Basile <blueness@gentoo.org> ramspeed-2.6.0.ebuild, + ramspeed-3.5.0.ebuild: + Restore to non-pic friendly versions, they should never have been changed 01 Dec 2012; Anthony G. Basile <blueness@gentoo.org> ramspeed-3.5.0-r1.ebuild: Fix issue with the working directory diff --git a/app-benchmarks/ramspeed/ramspeed-2.6.0.ebuild b/app-benchmarks/ramspeed/ramspeed-2.6.0.ebuild index 3e1f6bcec990..b729bd1f6689 100644 --- a/app-benchmarks/ramspeed/ramspeed-2.6.0.ebuild +++ b/app-benchmarks/ramspeed/ramspeed-2.6.0.ebuild @@ -1,6 +1,6 @@ # 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-2.6.0.ebuild,v 1.4 2012/12/01 17:51:26 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/ramspeed/ramspeed-2.6.0.ebuild,v 1.5 2012/12/01 18:02:23 blueness Exp $ EAPI=2 inherit flag-o-matic toolchain-funcs @@ -12,7 +12,7 @@ SRC_URI="http://www.alasir.com/software/${PN}/${P}.tar.gz" LICENSE="Alasir" SLOT="0" KEYWORDS="amd64 x86" -IUSE="sse pic" +IUSE="sse" src_prepare(){ tc-export CC AS @@ -29,11 +29,6 @@ src_configure(){ append-ldflags -Wl,-z,noexecstack obj=( ramspeed.o ${arch_prefix}{fltmark,fltmem,intmark,intmem}.o ) - #avoid pic unfriendly assembly, bug #442778 - if use pic; then - append-ldflags -nopie - fi - if use x86; then obj=( "${obj[@]}" ${arch_prefix}{cpuinfo/cpuinfo_main,cpuinfo/cpuinfo_ext}.o ) fi diff --git a/app-benchmarks/ramspeed/ramspeed-3.5.0.ebuild b/app-benchmarks/ramspeed/ramspeed-3.5.0.ebuild index 523c5e37d07a..209fe49b5d81 100644 --- a/app-benchmarks/ramspeed/ramspeed-3.5.0.ebuild +++ b/app-benchmarks/ramspeed/ramspeed-3.5.0.ebuild @@ -1,6 +1,6 @@ # 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.ebuild,v 1.2 2012/12/01 17:51:26 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/ramspeed/ramspeed-3.5.0.ebuild,v 1.3 2012/12/01 18:02:23 blueness Exp $ EAPI=2 inherit flag-o-matic toolchain-funcs @@ -15,7 +15,7 @@ SRC_URI="http://www.alasir.com/software/${PN}/${MY_P}.tar.gz" LICENSE="Alasir" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="sse pic" +IUSE="sse" src_prepare(){ tc-export CC AS @@ -35,11 +35,6 @@ src_configure(){ append-ldflags -Wl,-z,noexecstack obj=( ramsmp.o ${arch_prefix}{fltmark,fltmem,intmark,intmem}.o ) - #avoid pic unfriendly assembly, bug #442778 - if use pic; then - append-ldflags -nopie - fi - if use x86; then obj=( "${obj[@]}" ${arch_prefix}{cpuinfo/cpuinfo_main,cpuinfo/cpuinfo_ext}.o ) fi |