Rename aligned_alloc to tio_aligned_alloc, bug #429912.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x64D4CF24

4 files changed, 43 insertions, 6 deletions

diff --git a/app-benchmarks/tiobench/ChangeLog b/app-benchmarks/tiobench/ChangeLog
index edd6510dae24..cfdcee292a1e 100644
--- a/app-benchmarks/tiobench/ChangeLog
+++ b/app-benchmarks/tiobench/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-benchmarks/tiobench
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/tiobench/ChangeLog,v 1.16 2009/09/13 22:22:21 patrick Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/tiobench/ChangeLog,v 1.17 2012/11/04 22:46:26 swegener Exp $
+
+  04 Nov 2012; Sven Wegener <swegener@gentoo.org> tiobench-0.3.3-r2.ebuild,
+  +files/0.3.3-glibc-2.16.patch:
+  Rename aligned_alloc to tio_aligned_alloc, bug #429912.
 
   13 Sep 2009; Patrick Lauer <patrick@gentoo.org> tiobench-0.3.3-r2.ebuild:
   Removing virtual/libc deps
diff --git a/app-benchmarks/tiobench/Manifest b/app-benchmarks/tiobench/Manifest
index 49fd502d137a..a4e263a26279 100644
--- a/app-benchmarks/tiobench/Manifest
+++ b/app-benchmarks/tiobench/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 0.3.3-LDFLAGS.patch 470 SHA256 56498d2262bb8af1e07b8fcde6f2bfae35fd1f20da82cbd96855ead2d8d4fe96 SHA512 2c352d6ba3f6c3cb669ce0a0fe51390a02b6ed2f34436464561c45de08143d3fd14fccf609c9f8c1332a1ad2349b78b40e2a648f1b36caf521a793b8ee8c6c6a WHIRLPOOL 6854fd5f2b79b075e158fb0e83cef7f4fd617e5cfb70363f63aa8848ecf5560d90babb331f0fe1b35662a6fd1f92ce906214332931610de7a60254e6d4ff100e
 AUX 0.3.3-column-description-fix.patch 1032 SHA256 657c78edb76a40367ad026cbd5a195d8a36dfc4ad6c024524f39792120efdfe8 SHA512 b34ad47a75d99bb24ae04f2e2e578c1e957b8459250f201e35d535c3c70731d5e792ccff67192b0c4fa9b634e8e099539b94ba22de8bb37cf80c0f4851cf1883 WHIRLPOOL 2a66936b87f703f2e61c785c4509842571f2e589d0a6c0574b87c122561ff169139d8f750529dc974e7d87406412f5f2a1c7426a95134589c340ee7936a3759f
+AUX 0.3.3-glibc-2.16.patch 717 SHA256 6d1ed918a6b92ab801ee1c8183976d4145f3ce938356de4b697aed234cd068a2 SHA512 6ca5a5654f703243aeee5428c8dc133df97f47e55f536e6c9aa89455b54f0578b4af19119ad7bf868844fcf531b8fb93a1b4d9ad1f44527746b9c87c456d6cde WHIRLPOOL 0ac77f9a7ff3af271a793fa85d657997e1f5a18255de53b59e8386f8ad5f4f31d14db092fa915c3858e973198f6119c8eb482799e368dae181e677145741378e
 DIST tiobench-0.3.3.tar.gz 28282 SHA256 8ad011059a35ac70cdb5e3d3999ceee44a8e8e9078926844b0685b7ea9db2bcc SHA512 e2752e32e9deaea611217629e99dc8fd738e63b4a21f49a0286f894bece3a258a3d223e0eb403ad5350dbb408738b9c5ba7300a85c8eea464266152965730328 WHIRLPOOL f6bb9b353cbbf007f6095caa5e893b3bac9af2f4cdb681be9b3f1abf6e07a5b4cd8dd0ceebfa96fd4a888fa28528a78ce00ff239c93cb96a11795168e4b2e81e
-EBUILD tiobench-0.3.3-r2.ebuild 1079 SHA256 46deb93616d2877fd9f8587d63cdb7e045ee45dc494239a1e23af46c94baa6d9 SHA512 58f52463e1523b952999b405ef48aff254d9a7af00a0348a1f377a8f32a7972e2113fb1b4b378872a150120960a362d3cace69ec61630270390e5169143b9194 WHIRLPOOL e589c5280b5efbe55de6a96c601e568aed6d5453c47b25589a9b83596a9950ac166be0ad6b745f6df3ddaabd1c2a29c70340bdafc467b594c9ee68aac2d77ed5
-MISC ChangeLog 1996 SHA256 1383417adb9cb38a6324177b660fba0829853608465bf288d0cf1d0db885fa0d SHA512 eb4e75870298de93c451050262b5b99cf5dc3fa6790b0b10e5f190f19d557e3f48c0ebbb68af54c1194c5d1416d49c73bb2abe2563c26c139ee0745c2e6a5ad3 WHIRLPOOL 116b3fe9f3715c2008ccbc5e5b40a02c5ac484b844a05e7444eb4a6cb5a3e10130611765ec062ea80b1c5f8bda18dfa9cacc9b5a093c152b3fc280eb9d46aa22
+EBUILD tiobench-0.3.3-r2.ebuild 1125 SHA256 aaede5941b7b6b7fffc7a3bef9a7d4e4f2411e132cf0201e18827fe7e2ae299c SHA512 412181b3ee939f8dee677bd600be1289439df49a90d59fea4298fce9e1e2fa821bc02ec3348ba064c70399a5794c2ba80b86ed5441d93be96918315ab5c31953 WHIRLPOOL adac8ac0f8ba11177c39bf97df1813ab387f6062ffa4956ac6c27a3eac34d922f91cff604564480e1d6a1337adc0953c79c71377f7d06f4af5d3339c87d5c083
+MISC ChangeLog 2165 SHA256 0840f48e2add6416a9ba176af3f73b19c974fb86cab23d84da66d86c0791216c SHA512 0d651276178ebbf4b7e46c8bbaf8e2a92a8beb1742c87db25bc50264094f69f552f65130e0aff82d7eba1d5cebd0a6a80c4c5d6afa7a50b6e9bc70a926c45821 WHIRLPOOL 71bb4cae309f4d6c15f600bc7235cff690e46c1a79087ea11a6caa90fdddf7fee34715d11c420a0383d3bed3c62ef4311fe6e07b7757fe22f498d7dacd8050ba
 MISC metadata.xml 281 SHA256 bf650fbe55622eb1979c8db77f7d15788effb109fe33a6a1d8226854ea39d5a6 SHA512 1782ee79781c9759db819797498c135ed01dd0701650669e4bc62a7f1d06550dc83e8f0c8b0dd5bd2c79000290e712fe777d22d9815a8664dff5b9e0cc4f5531 WHIRLPOOL 871a38859324f3673c730b62afdb2b7ce51419c0a4217e825005b0654772b36f4f099458d38599db4d9903ae5f6216fb97c270e9c4b7b13b1f46c2fb4ba49567
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlCW8EMACgkQI1lqEGTUzyS/SQCePMf6WXpxAd1gbqiPjiuvH1+k
+aDYAoILKFmbWdRvqz2Vmq5mpdZcJd76D
+=W1Hw
+-----END PGP SIGNATURE-----
diff --git a/app-benchmarks/tiobench/files/0.3.3-glibc-2.16.patch b/app-benchmarks/tiobench/files/0.3.3-glibc-2.16.patch
new file mode 100644
index 000000000000..fed845a51d62
--- /dev/null
+++ b/app-benchmarks/tiobench/files/0.3.3-glibc-2.16.patch
@@ -0,0 +1,21 @@
+diff -Nur tiobench-0.3.3.orig/tiotest.c tiobench-0.3.3/tiotest.c
+--- tiobench-0.3.3.orig/tiotest.c	2001-03-05 02:34:00.000000000 +0000
++++ tiobench-0.3.3/tiotest.c	2012-11-04 22:44:41.695677071 +0000
+@@ -31,7 +31,7 @@
+ */
+ ArgumentOptions args;
+ 
+-static void * aligned_alloc(ssize_t size)
++static void * tio_aligned_alloc(ssize_t size)
+ {
+ 	caddr_t a;
+ 	a = mmap((caddr_t )0, size, 
+@@ -281,7 +281,7 @@
+ 		pthread_attr_setscope(&(d->threads[i].thread_attr),
+ 				      PTHREAD_SCOPE_SYSTEM);
+ 
+-		d->threads[i].buffer = aligned_alloc( d->threads[i].blockSize );
++		d->threads[i].buffer = tio_aligned_alloc( d->threads[i].blockSize );
+ 		if( d->threads[i].buffer == NULL )
+ 		{
+ 			perror("Error allocating memory");
diff --git a/app-benchmarks/tiobench/tiobench-0.3.3-r2.ebuild b/app-benchmarks/tiobench/tiobench-0.3.3-r2.ebuild
index 605b4be6537a..5a11bed11a2d 100644
--- a/app-benchmarks/tiobench/tiobench-0.3.3-r2.ebuild
+++ b/app-benchmarks/tiobench/tiobench-0.3.3-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 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/tiobench/tiobench-0.3.3-r2.ebuild,v 1.5 2009/09/13 22:22:21 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/tiobench/tiobench-0.3.3-r2.ebuild,v 1.6 2012/11/04 22:46:26 swegener Exp $
 
 inherit eutils toolchain-funcs
 
@@ -22,6 +22,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/${PV}-column-description-fix.patch
 	epatch "${FILESDIR}"/${PV}-LDFLAGS.patch
+	epatch "${FILESDIR}"/${PV}-glibc-2.16.patch
 
 	sed -i \
 		-e 's:/usr/local/bin:/usr/sbin:' tiobench.pl \