Fixed for cross-compiling, bug #428406, thanks to Thomas

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

3 files changed, 18 insertions, 5 deletions

diff --git a/dev-cpp/tbb/ChangeLog b/dev-cpp/tbb/ChangeLog
index b54bffa05395..a17fe8f63938 100644
--- a/dev-cpp/tbb/ChangeLog
+++ b/dev-cpp/tbb/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-cpp/tbb
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/ChangeLog,v 1.23 2012/06/18 18:06:59 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/ChangeLog,v 1.24 2012/08/01 16:48:21 bicatali Exp $
+
+  01 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org> tbb-4.0.297.ebuild:
+  Fixed for cross-compiling, bug #428406, thanks to Thomas
 
   18 Jun 2012; Julian Ospald <hasufell@gentoo.org> tbb-4.0.297.ebuild:
   stable for x86 wrt bug #412675
@@ -120,4 +123,3 @@
   +tbb-2.1.015.ebuild:
   Initial import. The ebuild differs much from the initial ebuild submitted
   by Matthew McCormick (bug #228641)
-
diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index 0da8e4b5a7f2..8c8edabce2b5 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -1,7 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX tbb-3.0.104-tests.patch 676 SHA256 7d486b4b462a9d13226a29f303a374209e52c4e5ef0d0c8a216ea0b503bb0b21 SHA512 95dd4af60a8395856b8c527b196341e97dec2b9b7f38eba29c2a1cc62abcf6c66546b8da08162bce444823e520ee40d2a1c240e97ed92b2108693627e2ccaac7 WHIRLPOOL ea2a728532550a809f494602e34f73ca80e3b8985e23ba10f1f4068eb55d785f51f1a15c1558b804b84dbca0686d0254ef278a9191a8f1e27d2314cc9cbaf6c7
 AUX tbb-4.0.297-ldflags.patch 11719 SHA256 05ca92a307e8c797b023c7984a739fc04ae54e0399b0036f89a7ae6c0bec6df7 SHA512 9575ad14b038c0f3636ecbb839cc222ae2a2cfe5f383516d40b49b0eb9115b8642eb31e3e2002fe0da5ebf17462a19eb7fc965ca134c4aa8d6d450979f47ae9b WHIRLPOOL 29e0cc4a01f488aa5497b37e1c83d839cf52509f986456cdaefdf78f333984f58bb1980c75301ae945d06c8543f34ff41b1f1c1b396ece81b36f15adbc001a0f
 AUX tbb-4.0.297-underlinking.patch 475 SHA256 489473e0f30a53d13bd508d3d720df2e6db24b1348470febd162d0834bf6a3de SHA512 26103f87299e56e08d404e0cdda47f3b2be89e770ea12e84ee7f681050364e674aca1ba8326b81db0a73c2f53e973b89b97af3f36c7e762d4699767481b64486 WHIRLPOOL 10e6e3f886dc1a8638f1788254e38f7f92ebbd9deab645e215e9abecfe871e8918de490dc0612de276829e75571db82bd04fe1a8606a50e5f2a6b938821a25fe
 DIST tbb40_297oss_src.tgz 2097295 SHA256 2d1d10564e536c0ecf50d2db984f9fd9c615909bab13531936f0ca2c0e7cc2c2 SHA512 d41365eb13fdaab78fbdbc20d7d39681e3b6effc3e162c887dc2298307c1b7ad510133c1df50a458d6fd30f8b90f6af7be990180fd25695c2428d096097b9af5 WHIRLPOOL 05b471a23ea2f8c1f4f04bfe48abcf3156b06e5a2b405ae10f6767f10cc80268875802c1c4a140eaafdb17c44c102d6aff69c8296e650c6dbc42ea3487576e30
-EBUILD tbb-4.0.297.ebuild 3342 SHA256 a631543e4441976c958d135856c81fccfb213ae4f334fbf1eaa41fe3d24729f4 SHA512 a07a8c8e737eb34ee45fe45b0b9095f621b68c58f02087f3312d2917742dc7fa494e94d0c350d2ea89bc47e8da23d8e48191f372c1cf43164e5486b564e294cf WHIRLPOOL bce27c9623ed6bef1aa3f795373728725ff83622818791430d8ac6b5942dce87579dfc711b2cf3919b549377fd737b48373bea15d6706220d62e5f5008530ade
-MISC ChangeLog 4335 SHA256 64994ff719c300883c19293af8578f75d62db95705bf587371d1aac7dc527be9 SHA512 fcba9c3a71b4d0d19507bfd4266e001f0c1bbe09818fde7b614bf85b271bd3e406a462414a7ad3686889d9ba3fd0ce444e9904b7e02e50a45f00570e341f3511 WHIRLPOOL 4ccfdb1178f1a635707acae207b8bc190ebfee661f4b5c887b2d760e0096fc3b5f2c7303e459472d8f4d07e3f32a1218166541088606ad8c678a41fb6ea1bec6
+EBUILD tbb-4.0.297.ebuild 3361 SHA256 a45c39d889b6bb35628c977dd26a2d73a98aaa178658f84ba333add08064d35d SHA512 7bccd26acd01f7bee0464a482bee5a00ca13967894b0f7637e9e63bf23c2e7d77771f5a47872d2b0f95d37449bae73f60a505a190856a6a0d556741dd81623ca WHIRLPOOL ab1f9d76684524bdd3170401f7f108e7eb030f23892471fccb12affe20f3091488f090bef5777f3d892a534abe4256dd3e5d94e233c6f401dd065a70cf38ff15
+MISC ChangeLog 4469 SHA256 e1c535319cfe4d0b8306b0dec94c92cf3d402f5cbd5f63c3e333752f1a26c157 SHA512 69307378c15bad5114c36e18bc991279efd1c5234d2e341c4766166ad95df0da20a115885c2fcea9cfbfe2392cdc49949eeeee5145fe66b13bff6f5233124527 WHIRLPOOL 5fb8efe9de04c43f41d4a48c4ad1012bf92bf06ca17eba9ccceaedf239526b4a2801477f47f7c9220bbbb7c960ceee93c903dc3c7cb5a74fbb70a18dc3b7b6df
 MISC metadata.xml 696 SHA256 e4a63e4e978f0a14647476dadca43ca19f1a767bf9d77203876d7b7e1360af66 SHA512 41205c3cb7bcdc119ebc4750dd4ef8ee966303205c0f3280b09600ba94005b70c4264a7d60784b9a4632149744eba3501d688564c12298bb452328c57eb049e6 WHIRLPOOL 0ad32e3f135f39c12892e39351afad880161709a355424b70b1857f67c6aba06f9c374c283eb8dcbad924d89a18ebf24f8b42e73b29a2d2a3e21b97188fbb713
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlAZXd8ACgkQ1ycZbhPLE2Ci6gCdHEgflLYP0ihgiP8tzqE2gDRt
+LWcAoKTP8y6y4DJAxPp6b0BBH2/W/w0H
+=2xo0
+-----END PGP SIGNATURE-----
diff --git a/dev-cpp/tbb/tbb-4.0.297.ebuild b/dev-cpp/tbb/tbb-4.0.297.ebuild
index 09572dbd9e9f..13f94419be5e 100644
--- a/dev-cpp/tbb/tbb-4.0.297.ebuild
+++ b/dev-cpp/tbb/tbb-4.0.297.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/dev-cpp/tbb/tbb-4.0.297.ebuild,v 1.8 2012/06/18 18:06:59 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.0.297.ebuild,v 1.9 2012/08/01 16:48:21 bicatali Exp $
 
 EAPI=4
 inherit eutils multilib versionator toolchain-funcs
@@ -45,6 +45,7 @@ src_prepare() {
 		-e "/CONLY/s/gcc/$(tc-getCC)/g" \
 		-e "s/gcc -/$(tc-getCC) -v/g" \
 		-e '/CPLUS_FLAGS +=/s/-march=pentium4//' \
+		-e 's/-m64//g' \
 		build/*.inc || die
 	# - Strip the $(shell ... >$(NUL) 2>$(NUL)) wrapping, leaving just the
 	#   actual command.