* [gentoo-commits] gentoo-x86 commit in app-benchmarks/ramspeed: metadata.xml ramspeed-3.5.0-r1.ebuild ramspeed-3.5.0.ebuild ramspeed-2.6.0.ebuild ChangeLog
@ 2012-12-01 17:51 Anthony G. Basile (blueness)
0 siblings, 0 replies; only message in thread
From: Anthony G. Basile (blueness) @ 2012-12-01 17:51 UTC (permalink / raw
To: gentoo-commits
blueness 12/12/01 17:51:26
Modified: metadata.xml ramspeed-3.5.0.ebuild
ramspeed-2.6.0.ebuild ChangeLog
Added: ramspeed-3.5.0-r1.ebuild
Log:
Fix to build on hardened/PIE, but #442778
(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Revision Changes Path
1.4 app-benchmarks/ramspeed/metadata.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-benchmarks/ramspeed/metadata.xml?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-benchmarks/ramspeed/metadata.xml?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-benchmarks/ramspeed/metadata.xml?r1=1.3&r2=1.4
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-benchmarks/ramspeed/metadata.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- metadata.xml 23 Sep 2011 21:22:08 -0000 1.3
+++ metadata.xml 1 Dec 2012 17:51:26 -0000 1.4
@@ -7,5 +7,7 @@
</maintainer>
<longdescription lang="en">
</longdescription>
+ <use>
+ <flag name='pic'>Force shared libraries to be built as PIC (this is slower)</flag>
+ </use>
</pkgmetadata>
-
1.2 app-benchmarks/ramspeed/ramspeed-3.5.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-benchmarks/ramspeed/ramspeed-3.5.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-benchmarks/ramspeed/ramspeed-3.5.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-benchmarks/ramspeed/ramspeed-3.5.0.ebuild?r1=1.1&r2=1.2
Index: ramspeed-3.5.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-benchmarks/ramspeed/ramspeed-3.5.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ramspeed-3.5.0.ebuild 22 Oct 2011 18:59:34 -0000 1.1
+++ ramspeed-3.5.0.ebuild 1 Dec 2012 17:51:26 -0000 1.2
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.1 2011/10/22 18:59:34 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/ramspeed/ramspeed-3.5.0.ebuild,v 1.2 2012/12/01 17:51:26 blueness Exp $
EAPI=2
inherit flag-o-matic toolchain-funcs
@@ -15,7 +15,7 @@
LICENSE="Alasir"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="sse"
+IUSE="sse pic"
src_prepare(){
tc-export CC AS
@@ -35,6 +35,11 @@
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
1.4 app-benchmarks/ramspeed/ramspeed-2.6.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-benchmarks/ramspeed/ramspeed-2.6.0.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-benchmarks/ramspeed/ramspeed-2.6.0.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-benchmarks/ramspeed/ramspeed-2.6.0.ebuild?r1=1.3&r2=1.4
Index: ramspeed-2.6.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-benchmarks/ramspeed/ramspeed-2.6.0.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ramspeed-2.6.0.ebuild 27 Aug 2010 23:32:42 -0000 1.3
+++ ramspeed-2.6.0.ebuild 1 Dec 2012 17:51:26 -0000 1.4
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.3 2010/08/27 23:32:42 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/ramspeed/ramspeed-2.6.0.ebuild,v 1.4 2012/12/01 17:51:26 blueness Exp $
EAPI=2
inherit flag-o-matic toolchain-funcs
@@ -12,7 +12,7 @@
LICENSE="Alasir"
SLOT="0"
KEYWORDS="amd64 x86"
-IUSE="sse"
+IUSE="sse pic"
src_prepare(){
tc-export CC AS
@@ -29,6 +29,11 @@
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
1.6 app-benchmarks/ramspeed/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-benchmarks/ramspeed/ChangeLog?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-benchmarks/ramspeed/ChangeLog?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-benchmarks/ramspeed/ChangeLog?r1=1.5&r2=1.6
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-benchmarks/ramspeed/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ChangeLog 22 Oct 2011 18:59:34 -0000 1.5
+++ ChangeLog 1 Dec 2012 17:51:26 -0000 1.6
@@ -1,6 +1,13 @@
# ChangeLog for app-benchmarks/ramspeed
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/ramspeed/ChangeLog,v 1.5 2011/10/22 18:59:34 patrick Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/ramspeed/ChangeLog,v 1.6 2012/12/01 17:51:26 blueness Exp $
+
+*ramspeed-3.5.0-r1 (01 Dec 2012)
+
+ 01 Dec 2012; Anthony G. Basile <blueness@gentoo.org>
+ +ramspeed-3.5.0-r1.ebuild, metadata.xml, ramspeed-2.6.0.ebuild,
+ ramspeed-3.5.0.ebuild:
+ Fix to build on hardened/PIE, but #442778
*ramspeed-3.5.0 (22 Oct 2011)
@@ -23,4 +30,3 @@
+metadata.xml:
Moved from sunrise overlay. Fixes bug #304101. Thanks to Dane Smith
<smithdanea@gmail.com> for the ebuild. He will proxy-maintain this one
-
1.1 app-benchmarks/ramspeed/ramspeed-3.5.0-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-benchmarks/ramspeed/ramspeed-3.5.0-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-benchmarks/ramspeed/ramspeed-3.5.0-r1.ebuild?rev=1.1&content-type=text/plain
Index: ramspeed-3.5.0-r1.ebuild
===================================================================
# 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.1 2012/12/01 17:51:26 blueness Exp $
EAPI="4"
inherit flag-o-matic toolchain-funcs
MY_PN="ramsmp"
MY_P=${MY_PN}-${PV}
DESCRIPTION="Benchmarking for memory and cache"
HOMEPAGE="http://www.alasir.com/software/ramspeed/"
SRC_URI="http://www.alasir.com/software/${PN}/${MY_P}.tar.gz"
LICENSE="Alasir"
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=./
use x86 && arch_prefix=i386/
use amd64 && arch_prefix=amd64/
#fix the stack
append-ldflags -Wl,-z,noexecstack
obj=( ramsmp.o ${arch_prefix}{fltmark,fltmem,intmark,intmem}.o )
if use pic; then
append-ldflags -nopie
fi
if use amd64; then
sed -i \
-e 's/call.*free/call\tfree@PLT/' \
-e 's/call.*gettimeofday/call\tgettimeofday@PLT/' \
-e 's/call.*malloc/call\tmalloc@PLT/' \
${arch_prefix}/*.s
fi
if use x86; then
obj=( "${obj[@]}" ${arch_prefix}{cpuinfo/cpuinfo_main,cpuinfo/cpuinfo_ext}.o )
fi
if use sse; then
use x86 && append-flags "-DLINUX -DI386_ASM"
use amd64 && append-flags "-DLINUX -DAMD64_ASM"
obj=( "${obj[@]}" ${arch_prefix}{mmxmark,mmxmem,ssemark,ssemem}.o )
fi
echo "ramsmp: ${obj[@]}" > Makefile
}
src_install(){
dobin ramsmp
dosym /usr/bin/ramsmp /usr/bin/ramspeed
dodoc HISTORY README
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-12-01 17:51 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-01 17:51 [gentoo-commits] gentoo-x86 commit in app-benchmarks/ramspeed: metadata.xml ramspeed-3.5.0-r1.ebuild ramspeed-3.5.0.ebuild ramspeed-2.6.0.ebuild ChangeLog Anthony G. Basile (blueness)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox