summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-cpp')
-rw-r--r--dev-cpp/tbb/ChangeLog6
-rw-r--r--dev-cpp/tbb/metadata.xml4
-rw-r--r--dev-cpp/tbb/tbb-4.1.20121003-r1.ebuild6
-rw-r--r--dev-cpp/tbb/tbb-4.2.20131118.ebuild4
-rw-r--r--dev-cpp/tbb/tbb-4.2.20140122.ebuild4
5 files changed, 14 insertions, 10 deletions
diff --git a/dev-cpp/tbb/ChangeLog b/dev-cpp/tbb/ChangeLog
index 57a3530b80e2..de69e43e2404 100644
--- a/dev-cpp/tbb/ChangeLog
+++ b/dev-cpp/tbb/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-cpp/tbb
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/ChangeLog,v 1.46 2014/04/30 16:44:25 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/ChangeLog,v 1.47 2014/06/08 08:14:26 jlec Exp $
+
+ 08 Jun 2014; Justin Lecher <jlec@gentoo.org> tbb-4.1.20121003-r1.ebuild,
+ tbb-4.2.20131118.ebuild, tbb-4.2.20140122.ebuild, metadata.xml:
+ Add compatibility with versioned gcc, #512672
*tbb-4.2.20140122 (30 Apr 2014)
diff --git a/dev-cpp/tbb/metadata.xml b/dev-cpp/tbb/metadata.xml
index 4e6e40611722..d9d21c8a6ebc 100644
--- a/dev-cpp/tbb/metadata.xml
+++ b/dev-cpp/tbb/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+ <herd>sci</herd>
+ <longdescription lang="en">
The Intel Threading Building Blocks is a library that helps you
leverage multi-core processor performance without having to be a
threading expert. It represents a higher-level, task-based
diff --git a/dev-cpp/tbb/tbb-4.1.20121003-r1.ebuild b/dev-cpp/tbb/tbb-4.1.20121003-r1.ebuild
index 303c4926fa6f..35b60864f3d2 100644
--- a/dev-cpp/tbb/tbb-4.1.20121003-r1.ebuild
+++ b/dev-cpp/tbb/tbb-4.1.20121003-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.1.20121003-r1.ebuild,v 1.1 2013/05/02 15:58:05 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.1.20121003-r1.ebuild,v 1.2 2014/06/08 08:14:26 jlec Exp $
EAPI=4
inherit eutils flag-o-matic multilib versionator toolchain-funcs
@@ -83,7 +83,7 @@ src_prepare() {
}
src_compile() {
- if [[ $(tc-getCXX) == *g++ ]]; then
+ if [[ $(tc-getCXX) == *g++* ]]; then
comp="gcc"
elif [[ $(tc-getCXX) == *ic*c ]]; then
comp="icc"
diff --git a/dev-cpp/tbb/tbb-4.2.20131118.ebuild b/dev-cpp/tbb/tbb-4.2.20131118.ebuild
index 92888b29a164..8c8203c4a4c7 100644
--- a/dev-cpp/tbb/tbb-4.2.20131118.ebuild
+++ b/dev-cpp/tbb/tbb-4.2.20131118.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.2.20131118.ebuild,v 1.1 2014/02/05 18:10:26 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.2.20131118.ebuild,v 1.2 2014/06/08 08:14:26 jlec Exp $
EAPI=5
inherit eutils flag-o-matic multilib versionator toolchain-funcs
@@ -87,7 +87,7 @@ src_prepare() {
}
src_compile() {
- if [[ $(tc-getCXX) == *g++ ]]; then
+ if [[ $(tc-getCXX) == *g++* ]]; then
comp="gcc"
elif [[ $(tc-getCXX) == *ic*c ]]; then
comp="icc"
diff --git a/dev-cpp/tbb/tbb-4.2.20140122.ebuild b/dev-cpp/tbb/tbb-4.2.20140122.ebuild
index b26eff363390..167ffe0b2323 100644
--- a/dev-cpp/tbb/tbb-4.2.20140122.ebuild
+++ b/dev-cpp/tbb/tbb-4.2.20140122.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.2.20140122.ebuild,v 1.1 2014/04/30 16:44:25 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.2.20140122.ebuild,v 1.2 2014/06/08 08:14:26 jlec Exp $
EAPI=5
inherit eutils flag-o-matic multilib versionator toolchain-funcs
@@ -87,7 +87,7 @@ src_prepare() {
}
src_compile() {
- if [[ $(tc-getCXX) == *g++ ]]; then
+ if [[ $(tc-getCXX) == *g++* ]]; then
comp="gcc"
elif [[ $(tc-getCXX) == *ic*c ]]; then
comp="icc"