Fix to build on hardened/PIE, but #442778

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

6 files changed, 120 insertions, 14 deletions

diff --git a/app-benchmarks/ramspeed/ChangeLog b/app-benchmarks/ramspeed/ChangeLog
index c48a705c59a0..fbd02268778b 100644
--- a/app-benchmarks/ramspeed/ChangeLog
+++ b/app-benchmarks/ramspeed/ChangeLog
@@ -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
-
diff --git a/app-benchmarks/ramspeed/Manifest b/app-benchmarks/ramspeed/Manifest
index 3eb5ba29f466..0cf02156e831 100644
--- a/app-benchmarks/ramspeed/Manifest
+++ b/app-benchmarks/ramspeed/Manifest
@@ -1,6 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST ramsmp-3.5.0.tar.gz 79481 SHA256 39fb15493fb3c293575746d56f6ab9faaa1d876d8b1f0d8e5a4042d2ace95839 SHA512 175cd2e568e4efdb1225e3c5319950376c4834633dd618324cf4268c762213733ed67ea94b4e5835b0259483e88afd2e9d9a3fde63515b8b25e5ec0b51f16b0e WHIRLPOOL 2e35adb0aa58a2d5ec81d64ab50bcfc3a7c831798aa13c62d80d2bfb907dcb048087047fd68fe9e7ccbd838848235bca5ee44ba6b203ac07c9945a7ea88a7447
 DIST ramspeed-2.6.0.tar.gz 77531 SHA256 f84e2e42b2b6b221ef9b586f6ae63d863db4ff21858e0ce7c84622a7c9522950 SHA512 9866e5525e0a9df1ab6a0e92085addfed50a987fb335d9127835ca0fb890f7614ad51bec15b7148648bbce8b4709b4f45114a51585bf0e881be56402934abdc4 WHIRLPOOL 04ab501739fa1ff9efd9c8fd371ddad9d907b38eae1e14d0228f28e955ccbdb944545ec2805cc33a3b27bdbe87bafd661ebd4ccebdb1faddb225ba8920063c57
-EBUILD ramspeed-2.6.0.ebuild 1173 SHA256 b62b2d463f932957e69e19cfe0f2b17d047edaab125dd7785b14cf0a9d114aed SHA512 b1faed91b660e174574e499ec930fe010af5ac36a2d11decc5caaf2ce07df55b114965c296cd3685d4828825460312c342240d1baf82ffd0964547fc31107f74 WHIRLPOOL 952fbc29457049674ef5c0ff4f6371390b8d2a7d2955102ebbe404db29bd30f92412e21292ac1eae8cd9c674fc57fccf32a841a0fc3b76c2dc18f9e505ebb98b
-EBUILD ramspeed-3.5.0.ebuild 1324 SHA256 f2e85470b8a132b97679deb5cd5abe574e7d418511dab001621b5611eab4e8f9 SHA512 03d1595eb05ba4e24f9ba8fdbf8f52c2d7a1e97a0baa0f06e166416dcd81b7d7ee36d2005fd8563017fec8cf12746e4d7ae1c18197a0e59eb2df80050acd76a9 WHIRLPOOL b08f7d160681107cb75dcf1e0de967d5bfec844e0b84040a8a5b004061f6745e079b530708324be9a3700a353f41abc08d1ef9fd19b96b72a890d16dab21c780
-MISC ChangeLog 962 SHA256 35f94223a27605e7abe01a9fd7160b32c97172eca31177c48fbdab731fe806fe SHA512 920a91fe1e91ebbd81c4eeb9397d2321ca7e20f59ae9fa13a4f96d55b124e37db17991cafb1b96b9ee01cbe02e3ef1c148bc1e2e13f86f30d1fa6c994d3dbade WHIRLPOOL c9d8d8445503b8d86e2296bd4afe682dbeed353426f4d885f8d624a5616d9cb336bb7fa21acc1611315cb2f188379dd57905c25f31646d4cb759814e9abdceba
-MISC metadata.xml 280 SHA256 1febd940db66d8ffe0ebc395b92ad54a28cc9814f285e4c3e0d78f0b095438f6 SHA512 8c1031133aa245664263e3391e947f9dee2f4a20c019d1fd0528f933a703789d3d99834a0812962195c74598c49c4f9edeeca46aa7a26586163d0db210fc5114 WHIRLPOOL 67d1115dec77a8379538db690c695cd656da9a588fa16a37ee90e824f71885463271f6f67cb8ddb3e5499feed891c569bd305e9ec447d271587f85bbefb815c2
+EBUILD ramspeed-2.6.0.ebuild 1269 SHA256 6d8d09fd94e362712fbc85d38ee26723ea9b72b35f4e2a3c05a0059338ae8346 SHA512 e3c1acc272e88cb7e34dcead6ba386327f73b62eb3d275fc850111408c97b88407b053e4138cc996605e2c5e6f26146e334ee46068f132229129513f624c6935 WHIRLPOOL 2309dc493d86a567a057b9371f2a956e5913b5c487fb6a0c1039695ee0279540aaaadd499d76639e16a0b67db30b761e1190855a443dc2c3d43b044495d8d329
+EBUILD ramspeed-3.5.0-r1.ebuild 1548 SHA256 c8144e603fc99c7e9b2f0e4974e468573bea163739db242cbfe917222dda4fb3 SHA512 b31ca42e5cf2c045c40b38324f457ad7670b0046d2ee7b21ab3583f8d375b9a05770b8a43b7d18a9e120feaeae12e7bd38cb094866015ff524fa99aa79a30cb2 WHIRLPOOL c21267b133950a098169f645099ecd1650e55de6ec79b9801db8f699ddfbe095f6d2466c897951bda935ec4679b3e46b1e9ebcef3a012e38c7c25e6e42cf7149
+EBUILD ramspeed-3.5.0.ebuild 1421 SHA256 91156a3ffe9834642a34553cde6c449373b0aea752b3518ded9bdb1aafd601b2 SHA512 454758699f8e94b2c06efda5ccec2b29c4b49cb5a04f537be432822148ff8e6e39129713a04964bfabfa281dba436d6e3e88c86c8b07dae9e74507eac519243e WHIRLPOOL d74f2372d5b9b8f76b604c9c3e4ff9b7cac07c18b4c0c41c486dcc97016f9961e22351e01eca9825da9f487e386f39edec92c7d0392d9c3f6cedea2d31638752
+MISC ChangeLog 1187 SHA256 6df6e6dc002905b1bb4d4abeb73315b3423ca97618406ed0fd08f81edc4b5aba SHA512 59a12ef8b76259696091027e893f14d95aca29b46173797eca4292788dd8dff683c820442caabd2364b8db7e414ebc1e964477398f1639a1cbe369e49a82a3ed WHIRLPOOL 9cfda992d8675f42ec95126cb703ba94c62ba5130c8553aee7b3afe1f30d86887ca022a45dff53e54dd9661a018bb45e606643659669aa4d145e96a802afa23f
+MISC metadata.xml 379 SHA256 21f1a45ebe96551bea9d2eede6c48836de737346eb83501d97b585497a6d9b8f SHA512 d1b154937833110f848a50548a90983f6a7500124ab6fcb433d9238d4ebfc4b34af4407a42a9f2a8d3e1c64b110c5b923b98eb2d49ab3e10b11480d5bdecd625 WHIRLPOOL 9129953f4ea70fd5c24a626d805696ba933395bba728d88bda301f6caaa2c2ba797488001a4891879d62aabc2a7346ae0bd6043201993191f7e5560ad13ce43f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQukOPAAoJEJOE+m71LUu6X5sP/2viRAEMmLz2Le2hW137EfuT
+epk9IHokx3syOGvMmdiib8qojygec9rFaadRveOcMdOv11t37bEXsREpwxpREAQE
+WykEUowNNu1oKLs1XQNA7lKfY6ey9k9lPVoB6U+bSy1qy+MfvY0E1CI2QsDTkWaI
+GWaJWaqhCX6jx4Xmn0FvDQXCRA6KL7qUFTGU8WuVXf5mnbL0gAXVskMDsyrsxk3L
+5l8vE7hSc20RBZ8UK6Pk/qGSgbvvn47LdcJRWDiKMBBLW+USzKS6+gzReu7RQpkZ
+f/hKzajptboI8lEsDCpGqDNpK4A49uozigXAXlE4rsTwO704pEqOJeKa6yvPDLpc
+fUmFwZiIn32SgbUdVl161NOY3xJojlb0kOPpMM2GdoljkjCfUB0dWv9U6tO4gqjz
+Wu6WpA7Qax0Z5X6Y3j8Dm5r/cORp4No4T77rH+bqgZgzTE785FhKMGGZXuCWVmoX
+p/I3ASJLyM98JuGXvgWymXPL10CN3LoSwYuBKrLCEeyvLQFTzL1SxUBoc/fM6LRP
+D4dZ3Xp0XSnGJGZa/3go6GjlCj+arzC82i4fSiUpjM+bsivv2HQ2W57GP3CxLH7l
+jcbuWxABvjDU4bv2oF/KSl/rNlkgNqCVVlAe/t2Q5LRd/qwY5H8fFUSrBN0r3khN
+dtjlMAp9O2I5OWqajkWZ
+=Rm3m
+-----END PGP SIGNATURE-----
diff --git a/app-benchmarks/ramspeed/metadata.xml b/app-benchmarks/ramspeed/metadata.xml
index c2d0fa277895..275b4ba95e15 100644
--- a/app-benchmarks/ramspeed/metadata.xml
+++ b/app-benchmarks/ramspeed/metadata.xml
@@ -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>
-
diff --git a/app-benchmarks/ramspeed/ramspeed-2.6.0.ebuild b/app-benchmarks/ramspeed/ramspeed-2.6.0.ebuild
index b558819c6c98..3e1f6bcec990 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-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 @@ SRC_URI="http://www.alasir.com/software/${PN}/${P}.tar.gz"
 LICENSE="Alasir"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="sse"
+IUSE="sse pic"
 
 src_prepare(){
 	tc-export CC AS
@@ -29,6 +29,11 @@ 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-r1.ebuild b/app-benchmarks/ramspeed/ramspeed-3.5.0-r1.ebuild
new file mode 100644
index 000000000000..dfe668516430
--- /dev/null
+++ b/app-benchmarks/ramspeed/ramspeed-3.5.0-r1.ebuild
@@ -0,0 +1,67 @@
+# 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
+}
diff --git a/app-benchmarks/ramspeed/ramspeed-3.5.0.ebuild b/app-benchmarks/ramspeed/ramspeed-3.5.0.ebuild
index 53ce7b8c1244..523c5e37d07a 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-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 @@ SRC_URI="http://www.alasir.com/software/${PN}/${MY_P}.tar.gz"
 LICENSE="Alasir"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="sse"
+IUSE="sse pic"
 
 src_prepare(){
 	tc-export CC AS
@@ -35,6 +35,11 @@ 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