PIC compile fixes for 32-bit.

Package-Manager: portage-2.2.0_alpha169/cvs/Linux x86_64

4 files changed, 90 insertions, 2 deletions

diff --git a/sys-block/fio/ChangeLog b/sys-block/fio/ChangeLog
index f07044b5e754..04ea1a2dbf7f 100644
--- a/sys-block/fio/ChangeLog
+++ b/sys-block/fio/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-block/fio
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/ChangeLog,v 1.28 2013/03/04 19:41:54 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/ChangeLog,v 1.29 2013/03/27 01:59:26 robbat2 Exp $
+
+*fio-2.0.14-r1 (27 Mar 2013)
+
+  27 Mar 2013; Robin H. Johnson <robbat2@gentoo.org>
+  +files/fio-2.0.14-pic-clobber-fix.patch, +fio-2.0.14-r1.ebuild:
+  PIC compile fixes for 32-bit.
 
 *fio-2.0.14 (04 Mar 2013)
 
diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest
index a0e29368ea2e..753f99b34bc6 100644
--- a/sys-block/fio/Manifest
+++ b/sys-block/fio/Manifest
@@ -1,3 +1,4 @@
+AUX fio-2.0.14-pic-clobber-fix.patch 1018 SHA256 224a0f76c1cf0f7ccbc39a5274366533a0155971b2e0d9d285e3284c8af25193 SHA512 84e3dd2ad14c230996f2b5fa133ccda401eadabc8ef253d1a134cf7eab6e4bb721b42a0c8b74042349cd08db8f78bad5fcb882d897472d53b919d144993d6523 WHIRLPOOL e4be27e42eb05515b431421fbd17edaeb077dff2471b00d41ab20c244baee66ff426a8e456ef0fc6f32197c44a0ca05becce00c4a9c3e1274ed4585b7107b1cd
 DIST fio-1.17.2.tar.bz2 1155486 SHA256 1bf40fb709b7e7dbee778139cabae6b70ec6a89a43ddd83450a6b981bf813498 SHA512 99ea0da474f2d23d17a4c8775d1ec0421c020f072e2ccfbf920cbf52edac934e365dac38cdbd15993dfa72dd09b81540b0b9802f1896f031e8682fdfd805ee4b WHIRLPOOL 61da7007e3b591b148f3ffba45c3c1ecf646c47ad08d78c258cdca2906c441285fa0db738e5b0b0113a00ed178d99973b5b380a03690fe5d2e279a361cea0201
 DIST fio-1.17.tar.bz2 1107885 SHA256 b536582f1355bf959350746dad5abab26ca646065eef84cf4b08d990726b26d4 SHA512 fdb2991470701af98974c7d29a079266791ef0069ad18937d8df56523ba10c7ec963acc958917c20a6aa9563f33579156a7151cc414f92f6b90636fa3ac5ef62 WHIRLPOOL c2b8689f627abe7bec101e2a698256d223542d7bfe61e4e22a048652900b905fced8a1988b2fe4b12e2a82d22b998f252aab68a2b62f5562e2b6461a7880ab7b
 DIST fio-1.18.1.tar.bz2 1206690 SHA256 5dc37a82b8bb8cd3c75d9fc5e135fd0cb313e19f6c1be5690ace365de990d4bb SHA512 fde9ab9804062281d7b7240a374bcdc4bd72b691c3b04af735bd2361690ccb3eff2876c92a87b526ee82a720f196c78b9f5c1dd0aee4a41c5c685fe16d0660ea WHIRLPOOL d0a7e0b37ba44056709e4f9004785c40f8b167e0a53dad6d948ed9c0c48a073e9826e64448894f0e705c9fac1869421829d4698c831fa7226f0cf2cafb89aeb8
@@ -32,9 +33,10 @@ EBUILD fio-1.58.ebuild 1011 SHA256 3b7a9591a5857688788ffa043cbaf7c9a24468d05872d
 EBUILD fio-1.99.10.ebuild 1014 SHA256 300447d95621a56f7ed7777ca4463a27402b3e8ec55dbc56cb929efb411a7c80 SHA512 cdfae37079957ff60b29f1c9f47b3813ce52baa9d185d4fd156ed1db04d8982e66d63a794c01395f8f5f27e9af5f379164c05f5e316e93e77ea165bc97c71bb4 WHIRLPOOL 2f7c973b26ec55be2dfc88c2cca9be0abc9f390ffa94205d74099cf4d31e05d61fb5b44323b88c461f0f05713da847896516544c6a66d478e8ff8e548b164d5e
 EBUILD fio-2.0.10.ebuild 955 SHA256 d36559078bf4f288169ebc03d5cef8a5900aede72a6befa86b55921165142314 SHA512 e8a013d2dc742f55c455b0b65ea8b4c4d33f171fc5c038db8a821335d00518e7c2dd5e49009ba7216d33fd15f1a69b40480a5de33cb2aa1045bb7107a11a2d4f WHIRLPOOL 7b87991aa8982b9ceabc400e8a2e524f76f2ddd798bb12543cc93445e6b88439091e608fb7eb490fb4ef30d94d320cbfcb7dd639b89971c08f6f08a5df690999
 EBUILD fio-2.0.13.ebuild 958 SHA256 259d17e6db182df83fea40a2b6acde66ea5a925ad95b605cf62976586a557c66 SHA512 ae79f0fa928bd2750d220b072f92c5169cae166b2166375a74fbc090944ea468f73051b516e738f2b9e2ab473857e9c119cbd48383cc37f8dffeda53e671d15f WHIRLPOOL 51aeabc2bc85858b51c81e32288a0d89ec9c978de4d9581fadd95e034fda6441a1cb5b79cf89eae6677aeefca54ed7cbd59a2763fd5fa21844a45f29f7802bf9
+EBUILD fio-2.0.14-r1.ebuild 1137 SHA256 16f33a93ce10bdf803d68f82e4206f95fb10c27d6ab86d482b9283fd5e5b451e SHA512 e1f384e9e49aa22dab46dc0d1d46b9bde3dc61d3a1866f02cfbff8d9bd66f2a3eb6c1525b4086cb610d1c118e7d239c696be2e9a59c08b8d0d97b61cc3f3d0f1 WHIRLPOOL bbb8031126fba9182234d81da2ff2687a2679d25d73d2f9a362b3f66d60dd0293fb7139eb1218a1475551b774b93c2ea71798558d319e95b34e1213a5d0253d8
 EBUILD fio-2.0.14.ebuild 1081 SHA256 ef622d50d43b4cb2c2dd8da762b9510283a299d18ce4e4e76527d6f615c772f7 SHA512 88898adcd8e4bc221fee50a01977b396de917669a6f8b98699fc6dadcc9ab306dff91693e30ce8da1aec22ea8337d128c915425ded67ea5a54d14c8301bf0933 WHIRLPOOL d1f603baf57deb9198432f22ba439c36548b87a782afded64179b9249c79c0237171fbe961c0264f34f7351d1f0d42948d000da952143ae586fc8af6f88a0f7c
 EBUILD fio-2.0.3.ebuild 1012 SHA256 a1e602601007ad48ac1ce21390d4a3df90ba775869aef0e8b10d2f8a037d144d SHA512 43bfc536e6a3337b6bf59ec42544cceeebccc02d3923b2aed305e75e24c16c2b8f1d1e26a801b43fadfba716ca657fe1bb0601f15022ebf66827e44b16bf2cc9 WHIRLPOOL d3adeb8c44cd333ad053ea7441a73af72d49bd45f8fabba9e59bcabf6d20fa5112605c725ba03c8c0c5d7a28ae800b521d4209aa1780d65a4422150cd25c70c3
 EBUILD fio-2.0.8.ebuild 959 SHA256 056b421e12c9c46d65c2336ef61e873bc3c934a43244df0a43b15012360598ba SHA512 b648749c404449d9e6a61ecbd3aacbe367327b42d72388614eb2cea58b7b53fb7e1e5131aedfee51e5b557fc637c283b7526f4911cc77299926b8d284a7ab61d WHIRLPOOL 9b79aaeee96efbbae6374450cc995c880a8ab3757614183e2615b4fb0606fc11214b1421b6f943d38e794e3b2b32c3c5332bb8e8421bb5a6d9b3265685fa103d
 EBUILD fio-2.0.9.ebuild 959 SHA256 a73d5feb166c41a35657269868514a456ed35106abbcca85d46d8b3c8dc678b6 SHA512 c6aadcab34294d37cc757e533cb7f97c073b822204a1e83714ed3e96dfc4a315ab40bf5effcf6bc6ca90a0027e53813789761ab9ff790fca9be9a63d52066aa8 WHIRLPOOL e5f939fc964880d4006624da3326849bd9cb5e7262d657a4100615f71a3a54dbc6a5110bf4d4d6ab0a47eb54f62c5dd0696213e34896d5aad09db9df7b850fcd
-MISC ChangeLog 3435 SHA256 1b1de805c51b64f04c13b5ff3fad3b42105c8d83e0286873845fcd7a1043dc08 SHA512 ce6b53d6f40b6802147efecab785242de80a86800fda4f5cd18d7eaa0f09532c5d7b86f3db7b1ea46f16eae5ab2a905e438f739910a3b84129571dcdce52663b WHIRLPOOL 5e8cdb1f3004e760832cc9a09cd2de1463d36e76bd84194e46cac445fd96d14e0e4f4c311532e29853551e14fbd7cd808cf1f9a5b37ac3c337a5017cb6885928
+MISC ChangeLog 3617 SHA256 9d6127f7a1e659ab7dfbbbd69a3492ffb79d3d7dbe67a6d8fbc4a2e3566c4cca SHA512 5808243690b6b78c528ab7ca4700421b21f1addd91d0156460e51b22ec8920483db114a1595f7553254903432814eb8621ef21c16bee745244af9bbf85803a9a WHIRLPOOL 4dd219a05e8a00e3cd423cd872a7880b0f094e6cdb9b0c2d0a732534b9d924495b600528bd6016e0285e1dff4553598ffcf51b29b071885c3760ba0a3dcf3ddf
 MISC metadata.xml 204 SHA256 f3aeb60df346d19b4d43cea2b2916d51674d99dabfce252723548687909cbd6b SHA512 f97ac61dcf6e780d89337c14c3cebae1af93a1246bf521bbec4f008ae43324dd6f3869cd5aec03e4ddde5220b57a9decaa6612dbae880d21a9c59267635e688f WHIRLPOOL aa295b44397d48d7d0ff8917d1812d73389288c4e6fa9d226bbdfc108ffe386cf83d67bfc019428fd28b119fb73cc185df80d377a55399cfadd61acc3853edc3
diff --git a/sys-block/fio/files/fio-2.0.14-pic-clobber-fix.patch b/sys-block/fio/files/fio-2.0.14-pic-clobber-fix.patch
new file mode 100644
index 000000000000..fa35e27c754e
--- /dev/null
+++ b/sys-block/fio/files/fio-2.0.14-pic-clobber-fix.patch
@@ -0,0 +1,29 @@
+diff -Nuar fio-2.0.14.orig/arch/arch-x86-common.h fio-2.0.14/arch/arch-x86-common.h
+--- fio-2.0.14.orig/arch/arch-x86-common.h	2013-02-21 18:12:32.000000000 +0000
++++ fio-2.0.14/arch/arch-x86-common.h	2013-03-27 01:48:04.000000000 +0000
+@@ -6,10 +6,24 @@
+ static inline void do_cpuid(unsigned int *eax, unsigned int *ebx,
+ 			    unsigned int *ecx, unsigned int *edx)
+ {
++#ifdef __PIC__
++    /* 32-bit Hardened GCC (PIC) uses register EBX, so it must be preserved 
++     * Fix ported from Gentoo's x86info-1.24-pic patch 
++     * http://tuxion.com/2010/07/02/clobber-registers.html */
++	asm volatile(
++            "movl %%ebx,%%edi\n"
++            "cpuid\n"
++            "movl %%ebx,%1\n"
++            "movl %%edi,%%ebx\n"
++		: "=a" (*eax), "=m" (*ebx), "=c" (*ecx), "=d" (*edx)
++		: "0" (*eax), "2" (*ecx)
++		: "memory", "%edi");
++#else
+ 	asm volatile("cpuid"
+ 		: "=a" (*eax), "=b" (*ebx), "=c" (*ecx), "=d" (*edx)
+ 		: "0" (*eax), "2" (*ecx)
+ 		: "memory");
++#endif
+ }
+ 
+ static inline void cpuid(unsigned int op,
+
diff --git a/sys-block/fio/fio-2.0.14-r1.ebuild b/sys-block/fio/fio-2.0.14-r1.ebuild
new file mode 100644
index 000000000000..c4b05df9e21b
--- /dev/null
+++ b/sys-block/fio/fio-2.0.14-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.0.14-r1.ebuild,v 1.1 2013/03/27 01:59:26 robbat2 Exp $
+
+EAPI="4"
+
+inherit toolchain-funcs flag-o-matic
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Jens Axboe's Flexible IO tester"
+HOMEPAGE="http://brick.kernel.dk/snaps/"
+SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="dev-libs/libaio"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	sed -i \
+		-e '/filter /s:-o:$(LDFLAGS) -o:' \
+		-e '/: depend$/d' \
+		-e '/^DEBUGFLAGS/s, -D_FORTIFY_SOURCE=2,,g' \
+		Makefile || die
+	epatch "$FILESDIR"/fio-2.0.14-pic-clobber-fix.patch
+}
+
+src_configure() {
+	: # not a real configure script
+	./configure --extra-cflags="${CFLAGS}" --cc="$(tc-getCC)"
+}
+
+src_compile() {
+	append-flags -W
+	emake V=1
+}
+
+src_install() {
+	emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man"
+	dodoc README REPORTING-BUGS HOWTO
+	docinto examples
+	dodoc examples/*
+	doman fio.1
+}