summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2012-08-01 16:48:21 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2012-08-01 16:48:21 +0000
commit155a4ecc641ac23920eb6a4baaaa251bbf30ca6e (patch)
treec3839ba9ccd4ac64942fc1504f5c49f988e46431 /dev-cpp/tbb
parentSecurity bump - bug #429324 (diff)
downloadgentoo-2-155a4ecc641ac23920eb6a4baaaa251bbf30ca6e.tar.gz
gentoo-2-155a4ecc641ac23920eb6a4baaaa251bbf30ca6e.tar.bz2
gentoo-2-155a4ecc641ac23920eb6a4baaaa251bbf30ca6e.zip
Fixed for cross-compiling, bug #428406, thanks to Thomas
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Diffstat (limited to 'dev-cpp/tbb')
-rw-r--r--dev-cpp/tbb/ChangeLog6
-rw-r--r--dev-cpp/tbb/tbb-4.0.297.ebuild3
2 files changed, 6 insertions, 3 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/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.