diff options
| author |   Sebastien Fabbro <bicatali@gentoo.org> | 2012-03-20 17:09:10 +0000 |
|---|---|---|
| committer | Sebastien Fabbro <bicatali@gentoo.org> | 2012-03-20 17:09:10 +0000 |
| commit | fa52ea3b7c85fa79eacb9f3e155c27dfebc9202a (patch) | |
| tree | 48fd29cd0ac5188eb23ea20828ce801f6b71e01e /dev-cpp/tbb | |
| parent | restrict test feature for bug #408915 (diff) | |
| download | gentoo-2-fa52ea3b7c85fa79eacb9f3e155c27dfebc9202a.tar.gz gentoo-2-fa52ea3b7c85fa79eacb9f3e155c27dfebc9202a.tar.bz2 gentoo-2-fa52ea3b7c85fa79eacb9f3e155c27dfebc9202a.zip | |
Update fix for compiler calls
(Portage version: 2.1.10.44/cvs/Linux x86_64)
Diffstat (limited to 'dev-cpp/tbb')
| -rw-r--r-- | dev-cpp/tbb/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-cpp/tbb/tbb-4.0.297.ebuild | 9 |
2 files changed, 8 insertions, 6 deletions
diff --git a/dev-cpp/tbb/ChangeLog b/dev-cpp/tbb/ChangeLog index dd27d5af5417..aef5eea8625c 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.17 2012/03/20 16:42:51 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/ChangeLog,v 1.18 2012/03/20 17:09:10 bicatali Exp $ + + 20 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org> tbb-4.0.297.ebuild: + Update fix for compiler calls 20 Mar 2012; Agostino Sarubbo <ago@gentoo.org> tbb-4.0.297.ebuild: Stable for amd64, wrt bug #408975 diff --git a/dev-cpp/tbb/tbb-4.0.297.ebuild b/dev-cpp/tbb/tbb-4.0.297.ebuild index 75fdc4bc0d90..11c751f8af20 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.2 2012/03/20 16:42:51 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.0.297.ebuild,v 1.3 2012/03/20 17:09:10 bicatali Exp $ EAPI=4 inherit eutils versionator toolchain-funcs @@ -32,12 +32,11 @@ S="${WORKDIR}/${MYP}" src_prepare() { epatch "${FILESDIR}"/${PN}-3.0.104-tests.patch # use fully qualified compilers. do not force pentium4 for x86 users - local CC="$(tc-getCC)" sed -i \ -e "s/-O2/${CXXFLAGS}/g" \ - -e 's/^\(CPLUS = \)g++ $/\1'"$(tc-getCXX)/" \ - -e 's/^\(CONLY = \)gcc$/\1'"${CC}/" \ - -e 's/\(shell \)gcc\( --version\)/\1'"${CC}"'\2/' \ + -e "/CPLUS/s/g++/$(tc-getCXX)/g" \ + -e "/CONLY/s/gcc/$(tc-getCC)/g" \ + -e "s/gcc -/$(tc-getCC) -v/g" \ -e '/CPLUS_FLAGS +=/s/-march=pentium4//' \ build/*.inc || die # - Strip the $(shell ... >$(NUL) 2>$(NUL)) wrapping, leaving just the |