[gentoo-commits] repo/gentoo:master commit in: dev-cpp/tbb/files/, dev-cpp/tbb/

2023-02-21 Thread Sam James 
commit: db75708351c07eb215d5b6635946ad4e9a4b424b
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb 21 09:59:05 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb 21 10:00:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db757083

dev-cpp/tbb: add 2021.8.0

Signed-off-by: Sam James  gentoo.org>

 dev-cpp/tbb/Manifest|  1 +
 dev-cpp/tbb/files/tbb-2021.8.0-gcc-13.patch | 26 
 dev-cpp/tbb/tbb-2021.8.0.ebuild | 46 +
 3 files changed, 73 insertions(+)

diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index 2235f67725f0..b2964240e09f 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -1,3 +1,4 @@
 DIST tbb-2020.3.tar.gz 2639788 BLAKE2B 
3e92bccdc8179fc049379ccbb8ad7f615623177abc61d813b1a601020c345137bfd7d4c4600cf5b0d587e5ebef677635c3c8124d06b05fdd3325128ed8c9f84a
 SHA512 
04c4b5501418792827190691d03d20d4dc1fd3cbbcf459a4d40c5c2281d964e658f31f133ad3907b78e17ed04f4ff16728ed89487ed0ce2cb239f23feb34bd87
 DIST tbb-2021.5.0.tar.gz 2463218 BLAKE2B 
2d50d312b86318ba4923afe68753b3781f9646cbdb33861f3458301a3a19b7ca3aab6959dca085294dfc743d7f552635f80fb524ec5d780a46f58ffe02e3280d
 SHA512 
0e7b71022e397a6d7abb0cea106847935ae79a1e12a6976f8d038668c6eca8775ed971202c5bd518f7e517092b67af805cc5feb04b5c3a40e9fbf972cc703a46
 DIST tbb-2021.7.0.tar.gz 2571727 BLAKE2B 
2977ef1a33d9bc7baa40e0e57c02e62798a09c6c66cdbe369f2702d87fd9877c3d97f8d83f71384028995ea0956f5c5630d4aaf4edbe68538e7c514d3b87085c
 SHA512 
d314e3d88b85c96607a9eda15e3d808bf361eb562a534c59101929236e90c187883e7718e5435b5e7f01f4ee652c9765af95f5f173368b83997e4666b7403a49
+DIST tbb-2021.8.0.tar.gz 2575336 BLAKE2B 
2c3a7f0e59d70b17550f805461a15a520c7f1b3a37a41bd51c51f9f5863b50812d2b939351e11e0f4ceb3da8a47e413abe171bcb6bfb71c0fe2f81ed373f65f2
 SHA512 
72f68730dfd89409796f9548d3c302111787712089688a7c77092ed1b3a7bf4e7444fe4b58015d2c78b7b71259852526789b2483bf1e71bea8146c4b4676e7b4

diff --git a/dev-cpp/tbb/files/tbb-2021.8.0-gcc-13.patch 
b/dev-cpp/tbb/files/tbb-2021.8.0-gcc-13.patch
new file mode 100644
index ..84a0ba3dc7a1
--- /dev/null
+++ b/dev-cpp/tbb/files/tbb-2021.8.0-gcc-13.patch
@@ -0,0 +1,26 @@
+https://github.com/oneapi-src/oneTBB/pull/1031
+
+From 363bf59bef2649b4d427788522da27c12f984a9a Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Tue, 21 Feb 2023 09:36:33 +
+Subject: [PATCH] test: common: include  for abort() (fix build with
+ GCC 13)
+
+GCC 13 (as usual for new compiler releases) shuffles around some
+internal includes and so  etc is no longer transitively included.
+
+See https://www.gnu.org/software/gcc/gcc-13/porting_to.html.
+
+Signed-off-by: Sam James 
+--- a/test/common/utils_assert.h
 b/test/common/utils_assert.h
+@@ -20,6 +20,8 @@
+ #include "config.h"
+ #include "utils_report.h"
+ 
++#include 
++
+ #define REPORT_FATAL_ERROR REPORT
+ 
+ namespace utils {
+

diff --git a/dev-cpp/tbb/tbb-2021.8.0.ebuild b/dev-cpp/tbb/tbb-2021.8.0.ebuild
new file mode 100644
index ..7fdc1d716762
--- /dev/null
+++ b/dev-cpp/tbb/tbb-2021.8.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="High level abstract threading library"
+HOMEPAGE="https://github.com/oneapi-src/oneTBB;
+SRC_URI="https://github.com/oneapi-src/oneTBB/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
+S="${WORKDIR}/oneTBB-${PV}"
+
+LICENSE="Apache-2.0"
+# https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53
+# libtbb-libtbbmalloc-libtbbbind
+SLOT="0/12.5-2.5-3.5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv 
~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="!kernel_Darwin? ( sys-apps/hwloc:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-2021.7.0-pthread-eagain.patch
+   "${FILESDIR}"/${PN}-2021.8.0-gcc-13.patch
+)
+
+src_prepare() {
+   # Has an #error to force compilation as C but links with C++ library, 
dies
+   # with GLIBCXX_ASSERTIONS as a result.
+   sed -i -e '/tbb_add_c_test(SUBDIR tbbmalloc NAME test_malloc_pure_c 
DEPENDENCIES TBB::tbbmalloc)/d' test/CMakeLists.txt || die
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DTBB_TEST=$(usex test)
+   -DTBB_ENABLE_IPO=OFF
+   -DTBB_STRICT=OFF
+   )
+
+   cmake-multilib_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: dev-cpp/tbb/files/, dev-cpp/tbb/

2022-05-10 Thread Sam James 
commit: ecf1ec7d75750a8a84659a3b1e6ecd977027d1ca
Author: Sam James  gentoo  org>
AuthorDate: Wed May 11 01:18:40 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 11 01:18:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecf1ec7d

dev-cpp/tbb: backport x86 build fix

Closes: https://bugs.gentoo.org/842762
Signed-off-by: Sam James  gentoo.org>

 dev-cpp/tbb/files/tbb-2021.5.0-x86-mwaitpkg.patch | 43 +++
 dev-cpp/tbb/tbb-2021.5.0-r1.ebuild|  2 ++
 2 files changed, 45 insertions(+)

diff --git a/dev-cpp/tbb/files/tbb-2021.5.0-x86-mwaitpkg.patch 
b/dev-cpp/tbb/files/tbb-2021.5.0-x86-mwaitpkg.patch
new file mode 100644
index ..83f119a9acd3
--- /dev/null
+++ b/dev-cpp/tbb/files/tbb-2021.5.0-x86-mwaitpkg.patch
@@ -0,0 +1,43 @@
+https://github.com/oneapi-src/oneTBB/pull/609
+https://github.com/oneapi-src/oneTBB/issues/370
+https://bugs.gentoo.org/842762
+
+From 542a27fa1cfafaf76772e793549d9f4d288d03a9 Mon Sep 17 00:00:00 2001
+From: Ilya Isaev 
+Date: Fri, 8 Oct 2021 10:18:16 +0300
+Subject: [PATCH] Detect 32 bit x86 systems while adding -mwaitpkg option
+
+Signed-off-by: Ilya Isaev 
+--- a/cmake/compilers/Clang.cmake
 b/cmake/compilers/Clang.cmake
+@@ -44,7 +44,7 @@ if (NOT TBB_STRICT AND COMMAND tbb_remove_compile_flag)
+ endif()
+ 
+ # Enable Intel(R) Transactional Synchronization Extensions (-mrtm) and 
WAITPKG instructions support (-mwaitpkg) on relevant processors
+-if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64)")
++if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64|i.86)")
+ set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm 
$<$>:-mwaitpkg>)
+ endif()
+ 
+--- a/cmake/compilers/GNU.cmake
 b/cmake/compilers/GNU.cmake
+@@ -36,7 +36,7 @@ if (NOT CMAKE_GENERATOR MATCHES "Ninja" AND NOT 
CMAKE_CXX_DEPENDS_USE_COMPILER)
+ endif()
+ 
+ # Enable Intel(R) Transactional Synchronization Extensions (-mrtm) and 
WAITPKG instructions support (-mwaitpkg) on relevant processors
+-if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64)")
++if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64|i.86)")
+ set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm 
$<$>,$>>:-mwaitpkg>)
+ endif()
+ 
+--- a/cmake/compilers/MSVC.cmake
 b/cmake/compilers/MSVC.cmake
+@@ -72,7 +72,7 @@ if (TBB_WINDOWS_DRIVER)
+ endif()
+ 
+ if (CMAKE_CXX_COMPILER_ID MATCHES "(Clang|IntelLLVM)")
+-if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64)")
++if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64|i.86)")
+ set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm 
-mwaitpkg)
+ endif()
+ set(TBB_OPENMP_NO_LINK_FLAG TRUE)

diff --git a/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild 
b/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild
index 8c4c5a5883a4..4235949bb77b 100644
--- a/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild
+++ b/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild
@@ -32,6 +32,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-2021.5.0-musl-mallinfo.patch
# musl again, should be in.. 2022?
"${FILESDIR}"/${PN}-2021.5.0-musl-setcontext.patch
+   # should be in.. 2022?
+   "${FILESDIR}"/${PN}-2021.5.0-x86-mwaitpkg.patch
 
"${FILESDIR}"/${PN}-2021.5.0-flags-stripping.patch
 )

[gentoo-commits] repo/gentoo:master commit in: dev-cpp/tbb/files/, dev-cpp/tbb/

2022-01-16 Thread Sam James 
commit: 6b1f12b618de51fd2f750d87f28b5bbc992d37ad
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 17 06:26:58 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 17 06:26:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b1f12b6

dev-cpp/tbb: add another musl patch

Closes: https://bugs.gentoo.org/828704
Signed-off-by: Sam James  gentoo.org>

 dev-cpp/tbb/files/tbb-2021.5.0-musl-mallinfo.patch | 32 ++
 dev-cpp/tbb/tbb-2021.5.0.ebuild|  2 ++
 2 files changed, 34 insertions(+)

diff --git a/dev-cpp/tbb/files/tbb-2021.5.0-musl-mallinfo.patch 
b/dev-cpp/tbb/files/tbb-2021.5.0-musl-mallinfo.patch
new file mode 100644
index ..e46c16f42f59
--- /dev/null
+++ b/dev-cpp/tbb/files/tbb-2021.5.0-musl-mallinfo.patch
@@ -0,0 +1,32 @@
+https://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch
+https://github.com/oneapi-src/oneTBB/pull/203
+https://bugs.gentoo.org/828704
+
+From: Naveen Saini 
+Date: Wed, 7 Apr 2021 11:14:13 +0800
+Subject: [PATCH] mallinfo() is glibc specific API mark it so
+
+Helps compiling with musl
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj 
+Signed-off-by: Naveen Saini 
+--- a/src/tbbmalloc_proxy/proxy.cpp
 b/src/tbbmalloc_proxy/proxy.cpp
+@@ -260,6 +260,7 @@ int mallopt(int /*param*/, int /*value*/
+ return 1;
+ }
+ 
++#ifdef __GLIBC__
+ struct mallinfo mallinfo() __THROW
+ {
+ struct mallinfo m;
+@@ -267,6 +268,7 @@ struct mallinfo mallinfo() __THROW
+ 
+ return m;
+ }
++#endif
+ 
+ #if __ANDROID__
+ // Android doesn't have malloc_usable_size, provide it to be compatible

diff --git a/dev-cpp/tbb/tbb-2021.5.0.ebuild b/dev-cpp/tbb/tbb-2021.5.0.ebuild
index 2ab975036c65..1fa9bfc11894 100644
--- a/dev-cpp/tbb/tbb-2021.5.0.ebuild
+++ b/dev-cpp/tbb/tbb-2021.5.0.ebuild
@@ -26,6 +26,8 @@ PATCHES=(
# should be in.. 2022?
"${FILESDIR}"/${PN}-2021.4.0-lto.patch
"${FILESDIR}"/${PN}-2021.5.0-musl-deepbind.patch
+   # need to verify this is in master
+   "${FILESDIR}"/${PN}-2021.5.0-musl-mallinfo.patch
 )
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: dev-cpp/tbb/files/, dev-cpp/tbb/

2021-10-29 Thread Sam James 
commit: d54c2c9388acb851a5bd7c48962bb7b68ca5d39c
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 29 21:21:59 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 29 22:22:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d54c2c93

dev-cpp/tbb: add 2021.4.0

Bug: https://bugs.gentoo.org/713582
Signed-off-by: Sam James  gentoo.org>

 dev-cpp/tbb/Manifest |   1 +
 dev-cpp/tbb/files/tbb-2021.4.0-lto.patch | 247 +++
 dev-cpp/tbb/tbb-2021.4.0.ebuild  |  37 +
 3 files changed, 285 insertions(+)

diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index d2d3f1d78cf..fee2e0bbf7f 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -1 +1,2 @@
 DIST tbb-2020.3.tar.gz 2639788 BLAKE2B 
3e92bccdc8179fc049379ccbb8ad7f615623177abc61d813b1a601020c345137bfd7d4c4600cf5b0d587e5ebef677635c3c8124d06b05fdd3325128ed8c9f84a
 SHA512 
04c4b5501418792827190691d03d20d4dc1fd3cbbcf459a4d40c5c2281d964e658f31f133ad3907b78e17ed04f4ff16728ed89487ed0ce2cb239f23feb34bd87
+DIST tbb-2021.4.0.tar.gz 2452533 BLAKE2B 
a635c6efa1894c33e2f75c1aa03b6c0f4a86ebef3b58fa42bd25b53d661ed7a9d21f49f121dd3679735f219fbfc35604600bcc72ba60d3602e6de77b0d62e37b
 SHA512 
96da2bc351fd64dfa854f8e6cabc1c4e53af3d55760e99d6f83ad53779c727af333d13d6be0828ed70371cf796498d2063e9dd0e4b2f6451623bb5d28ccbf20b

diff --git a/dev-cpp/tbb/files/tbb-2021.4.0-lto.patch 
b/dev-cpp/tbb/files/tbb-2021.4.0-lto.patch
new file mode 100644
index 000..5be97b90605
--- /dev/null
+++ b/dev-cpp/tbb/files/tbb-2021.4.0-lto.patch
@@ -0,0 +1,247 @@
+From 6feeba8035ea2bdf652d473a35730b19427752db Mon Sep 17 00:00:00 2001
+From: Ivan Kochin 
+Date: Wed, 27 Oct 2021 17:23:32 +0300
+Subject: [PATCH] Use native CMake way to detect the IPO support (#608)
+
+* Use native CMake way to detect the IPO support
+
+Signed-off-by: Kochin Ivan 
+---
+ CMakeLists.txt   | 17 +
+ cmake/README.md  |  1 +
+ cmake/compilers/Clang.cmake  |  8 ++--
+ cmake/compilers/GNU.cmake|  8 +++-
+ cmake/compilers/MSVC.cmake   |  1 +
+ cmake/utils.cmake| 13 +
+ src/tbb/CMakeLists.txt   |  5 ++---
+ src/tbbbind/CMakeLists.txt   |  6 +++---
+ src/tbbmalloc/CMakeLists.txt |  5 ++---
+ 9 files changed, 44 insertions(+), 20 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 13b1dbc2c..4dbdadb97 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -103,6 +103,7 @@ option(TBBMALLOC_BUILD "Enable tbbmalloc build" ON)
+ option(TBB_CPF "Enable preview features of the library" OFF)
+ option(TBB_FIND_PACKAGE "Enable search for external oneTBB using find_package 
instead of build from sources" OFF)
+ option(TBB_DISABLE_HWLOC_AUTOMATIC_SEARCH "Disable HWLOC automatic search by 
pkg-config tool" OFF)
++option(TBB_ENABLE_IPO "Enable Interprocedural Optimization (IPO) during the 
compilation" ON)
+ 
+ if (NOT DEFINED BUILD_SHARED_LIBS)
+ set(BUILD_SHARED_LIBS ON)
+@@ -181,6 +182,22 @@ foreach(FILE_WITH_EXTRA_TARGETS 
${FILES_WITH_EXTRA_TARGETS})
+ include(${FILE_WITH_EXTRA_TARGETS})
+ endforeach()
+ 
++# - Enabling LTO on Android causes the NDK bug.
++#   NDK throws the warning: "argument unused during compilation: 
'-Wa,--noexecstack'"
++# - For some reason GCC does not instrument code with Thread Sanitizer when 
lto is enabled and C linker is used.
++if (TBB_ENABLE_IPO AND BUILD_SHARED_LIBS AND NOT ANDROID_PLATFORM AND NOT 
TBB_SANITIZE MATCHES "thread")
++if (NOT CMAKE_VERSION VERSION_LESS 3.9)
++cmake_policy(SET CMP0069 NEW)
++include(CheckIPOSupported)
++check_ipo_supported(RESULT TBB_IPO_PROPERTY)
++else()
++set(TBB_IPO_FLAGS TRUE)
++endif()
++if (TBB_IPO_PROPERTY OR TBB_IPO_FLAGS)
++message(STATUS "IPO enabled")
++endif()
++endif()
++
+ set(TBB_COMPILER_SETTINGS_FILE 
${CMAKE_CURRENT_SOURCE_DIR}/cmake/compilers/${CMAKE_CXX_COMPILER_ID}.cmake)
+ if (EXISTS ${TBB_COMPILER_SETTINGS_FILE})
+ include(${TBB_COMPILER_SETTINGS_FILE})
+diff --git a/cmake/README.md b/cmake/README.md
+index ec56e423c..ed1631de3 100644
+--- a/cmake/README.md
 b/cmake/README.md
+@@ -16,6 +16,7 @@ TBB_CPF:BOOL - Enable preview features of the library (OFF 
by default)
+ TBB_INSTALL_VARS:BOOL - Enable auto-generated vars installation(packages 
generated by `cpack` and `make install` will also include the vars script)(OFF 
by default)
+ TBB_VALGRIND_MEMCHECK:BOOL - Enable scan for memory leaks using Valgrind (OFF 
by default)
+ TBB_DISABLE_HWLOC_AUTOMATIC_SEARCH - Disable HWLOC automatic search by 
pkg-config tool (OFF by default)
++TBB_ENABLE_IPO - Enable Interprocedural Optimization (IPO) during the 
compilation (ON by default)
+ ```
+ 
+ ## Configure, build and test
+diff --git a/cmake/compilers/Clang.cmake b/cmake/compilers/Clang.cmake
+index 183341fcc..69aa51932 100644
+--- a/cmake/compilers/Clang.cmake
 b/cmake/compilers/Clang.cmake
+@@ -58,12 +58,8 @@ if

[gentoo-commits] repo/gentoo:master commit in: dev-cpp/tbb/files/, dev-cpp/tbb/

2018-04-15 Thread Amy Liffey 
commit: 68a56794e2d35c9233511ec1c2da89c2d10d6473
Author: Marty E. Plummer  startmail  com>
AuthorDate: Sun Apr  8 20:23:42 2018 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Sun Apr 15 14:22:50 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68a56794

dev-cpp/tbb: clean duplicate patches

Closes: https://github.com/gentoo/gentoo/pull/7898
Package-Manager: Portage-2.3.28, Repoman-2.3.9

 dev-cpp/tbb/files/tbb-2017.20161128-build.patch|  6 --
 dev-cpp/tbb/files/tbb-2017.20161128-underlinking.patch | 15 ---
 dev-cpp/tbb/files/tbb-4.0.297-underlinking.patch   |  4 ++--
 dev-cpp/tbb/files/tbb-4.3.20150611-build.patch | 11 ---
 dev-cpp/tbb/files/tbb-4.4.20160803-build.patch |  6 --
 dev-cpp/tbb/tbb-2017.20161128.ebuild   |  6 +++---
 dev-cpp/tbb/tbb-4.4.20160803.ebuild|  6 +++---
 7 files changed, 8 insertions(+), 46 deletions(-)

diff --git a/dev-cpp/tbb/files/tbb-2017.20161128-build.patch 
b/dev-cpp/tbb/files/tbb-2017.20161128-build.patch
index 0806d6a522b..e952bfbc434 100644
--- a/dev-cpp/tbb/files/tbb-2017.20161128-build.patch
+++ b/dev-cpp/tbb/files/tbb-2017.20161128-build.patch
@@ -1,5 +1,3 @@
-diff --git a/build/FreeBSD.gcc.inc b/build/FreeBSD.gcc.inc
-index e93f8f4..2b43c51 100644
 --- a/build/FreeBSD.gcc.inc
 +++ b/build/FreeBSD.gcc.inc
 @@ -28,8 +28,8 @@ WARNING_KEY = -Wall
@@ -46,8 +44,6 @@ index e93f8f4..2b43c51 100644
  TBB_ASM.OBJ = atomic_support.o lock_byte.o log2.o pause.o
  MALLOC_ASM.OBJ = atomic_support.o lock_byte.o pause.o
  endif 
-diff --git a/build/linux.clang.inc b/build/linux.clang.inc
-index 237caae..8d6914e 100644
 --- a/build/linux.clang.inc
 +++ b/build/linux.clang.inc
 @@ -31,15 +31,15 @@ DYLIB_KEY = -shared
@@ -107,8 +103,6 @@ index 237caae..8d6914e 100644
  ifeq ($(cfg),debug)
  ASM_FLAGS += -g
  endif
-diff --git a/build/linux.gcc.inc b/build/linux.gcc.inc
-index b7ed0c5..a8e8f85 100644
 --- a/build/linux.gcc.inc
 +++ b/build/linux.gcc.inc
 @@ -32,12 +32,12 @@ DYLIB_KEY = -shared

diff --git a/dev-cpp/tbb/files/tbb-2017.20161128-underlinking.patch 
b/dev-cpp/tbb/files/tbb-2017.20161128-underlinking.patch
deleted file mode 100644
index 5935017a325..000
--- a/dev-cpp/tbb/files/tbb-2017.20161128-underlinking.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=418447
-
 a/build/Makefile.test
-+++ b/build/Makefile.test
-@@ -44,8 +44,8 @@
- USE_PROXY_FLAG = $(DEFINE_KEY)HARNESS_USE_PROXY
- CPLUS_FLAGS += $(USE_PROXY_FLAG)
- LINK_TBB.LIB = $(PROXY.LIB)
--LIBS += $(LIBDL)
--endif
-+endif
-+LIBS += $(LIBDL)
- 
- TEST_SUFFIXES=secondary compiler_builtins pic
- include $(tbb_root)/build/common_rules.inc

diff --git a/dev-cpp/tbb/files/tbb-4.0.297-underlinking.patch 
b/dev-cpp/tbb/files/tbb-4.0.297-underlinking.patch
index 099bb39d214..ed318cab838 100644
--- a/dev-cpp/tbb/files/tbb-4.0.297-underlinking.patch
+++ b/dev-cpp/tbb/files/tbb-4.0.297-underlinking.patch
@@ -5,8 +5,8 @@ Subject: build system
 fix underlinking in test phase
 wrt https://bugs.gentoo.org/show_bug.cgi?id=418447
 
 build/Makefile.test
-+++ build/Makefile.test
+--- a/build/Makefile.test
 b/build/Makefile.test
 @@ -48,8 +48,8 @@
  USE_PROXY_FLAG = $(DEFINE_KEY)HARNESS_USE_PROXY
  CPLUS_FLAGS += $(USE_PROXY_FLAG)

diff --git a/dev-cpp/tbb/files/tbb-4.3.20150611-build.patch 
b/dev-cpp/tbb/files/tbb-4.3.20150611-build.patch
index 42a8bae4640..8f806989e44 100644
--- a/dev-cpp/tbb/files/tbb-4.3.20150611-build.patch
+++ b/dev-cpp/tbb/files/tbb-4.3.20150611-build.patch
@@ -1,10 +1,3 @@
- build/FreeBSD.gcc.inc | 18 --
- build/linux.clang.inc | 26 +++---
- build/linux.gcc.inc   | 38 +++---
- 3 files changed, 14 insertions(+), 68 deletions(-)
-
-diff --git a/build/FreeBSD.gcc.inc b/build/FreeBSD.gcc.inc
-index 20f0027..8bbdeba 100644
 --- a/build/FreeBSD.gcc.inc
 +++ b/build/FreeBSD.gcc.inc
 @@ -28,14 +28,14 @@ WARNING_KEY = -Wall
@@ -49,8 +42,6 @@ index 20f0027..8bbdeba 100644
  TBB_ASM.OBJ = atomic_support.o lock_byte.o log2.o pause.o
  MALLOC_ASM.OBJ = atomic_support.o lock_byte.o pause.o
  endif 
-diff --git a/build/linux.clang.inc b/build/linux.clang.inc
-index de9aee5..3a366f1 100644
 --- a/build/linux.clang.inc
 +++ b/build/linux.clang.inc
 @@ -31,15 +31,15 @@ DYLIB_KEY = -shared
@@ -110,8 +101,6 @@ index de9aee5..3a366f1 100644
  ifeq ($(cfg),debug)
  ASM_FLAGS += -g
  endif
-diff --git a/build/linux.gcc.inc b/build/linux.gcc.inc
-index 4b7122b..e8ba711 100644
 --- a/build/linux.gcc.inc
 +++ b/build/linux.gcc.inc
 @@ -32,12 +32,12 @@ DYLIB_KEY = -shared

diff --git a/dev-cpp/tbb/files/tbb-4.4.20160803-build.patch 
b/dev-cpp/tbb/files/tbb-4.4.20160803-build.patch
index 9c66c132fff..f4af5de9e50 100644
--- a/dev-cpp/tbb/files/tbb-4.4.20160803-build.patch
+++ b/dev-cpp/tbb/files/tbb-4.4.20160803-build.patch
@@ -1,5 +1,3 @@
-diff

[gentoo-commits] repo/gentoo:master commit in: dev-cpp/tbb/files/, dev-cpp/tbb/

2017-03-30 Thread Matthias Maier 
commit: 0451d48fdba160cc23c46611d1cf4decf10946e3
Author: Matthias Maier  gentoo  org>
AuthorDate: Fri Mar 31 02:06:23 2017 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Fri Mar 31 02:15:46 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0451d48f

dev-cpp/tbb: version bump to 4.4.20160803, bug #596130

Package-Manager: Portage-2.3.3, Repoman-2.3.2

 dev-cpp/tbb/Manifest   |   1 +
 dev-cpp/tbb/files/tbb-4.4.20160803-build.patch | 193 +
 .../tbb/files/tbb-4.4.20160803-underlinking.patch  |  15 ++
 dev-cpp/tbb/tbb-4.4.20160803.ebuild| 145 
 4 files changed, 354 insertions(+)

diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index 71f464d6d4d..a7b1897ff55 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -1,2 +1,3 @@
 DIST tbb2017_20161128oss_src.tgz 2965854 SHA256 
c009166233c8ea0e34530a1c5f870b79314316d19e6876b37a7e7c854080a540 SHA512 
3c48ce196d2d3557e86cea7ede9dea456bbaeb29dbed34210f99c6f380406403a6056ccfa3d5befe6b29c4f8a9ee58ca6da545249cf4ec4ec85b463e04e4518c
 WHIRLPOOL 
d1ce8d07ac002c617afa7c0aa1d5cad41928a6eefd064a744b4efdd0192dd310ad8cb32b949858a7c2c44211477deffc05dbd65e8101184d4cae26744143b922
 DIST tbb43_20150611oss_src.tgz 2757631 SHA256 
221f85fe64e11c9638e43b3c57d5750c26683905fc90827c0bcfefdb286e79c9 SHA512 
83d5d827706b774ef5cd6df8082e5d7f48683388684423bb40565dfc25892fc2e57c382f719b78087d83e51edb3f7f7215f33d8b5039b55c32788d80efa6e0b8
 WHIRLPOOL 
8e98162b2307c759fb26923d76ab784dea81e166c8bf5323869d234da59641c333e5ae30b4a224bccbf20d4f5f6b75c658589f519a165ea3ad7658322f148c72
+DIST tbb44_20160803oss_src.tgz 2874050 SHA256 
23fb69a16b5daccef8e1ffe194d1dd5c6b1d225c0de87e54bc30c958aa244fb0 SHA512 
01b1dcdaffa96c3d503e44d7b236b1115f419c122dab0f40de4c9dc90db315a1f3755cc91adf9df91d5d31d8927df115230db94cf175edac09ae438b46374a92
 WHIRLPOOL 
2b93bfabc0eadb1a10ad34f1a475322a04554bd8b5e4ac90505ec285f7727a537249a045f7a464fb3c266f9ece6c83fa259a099cc052da16cdd6c05cd9a1fb42

diff --git a/dev-cpp/tbb/files/tbb-4.4.20160803-build.patch 
b/dev-cpp/tbb/files/tbb-4.4.20160803-build.patch
new file mode 100644
index 000..9c66c132fff
--- /dev/null
+++ b/dev-cpp/tbb/files/tbb-4.4.20160803-build.patch
@@ -0,0 +1,193 @@
+diff --git a/build/FreeBSD.gcc.inc b/build/FreeBSD.gcc.inc
+index dc22ca3..65dfb6e 100644
+--- a/build/FreeBSD.gcc.inc
 b/build/FreeBSD.gcc.inc
+@@ -28,8 +28,8 @@ WARNING_KEY = -Wall
+ DYLIB_KEY = -shared
+ WARNING_SUPPRESS = -Wno-parentheses
+ 
+-CPLUS = g++ 
+-CONLY = gcc
++CPLUS = $(CXX)
++CONLY = $(CC)
+ LIB_LINK_FLAGS = -shared
+ LIBS = -lpthread 
+ C_FLAGS = $(CPLUS_FLAGS)
+@@ -42,7 +42,7 @@ ifneq (,$(shell gcc -dumpversion | egrep  "^([6-9])"))
+ endif
+ 
+ ifeq ($(cfg), release)
+-CPLUS_FLAGS = -g -O2 -DUSE_PTHREAD
++CPLUS_FLAGS = -g -DUSE_PTHREAD
+ endif
+ ifeq ($(cfg), debug)
+ CPLUS_FLAGS = -DTBB_USE_DEBUG -g -O0 -DUSE_PTHREAD
+@@ -59,22 +59,12 @@ ifeq (ia64,$(arch))
+ CPLUS_FLAGS += $(PIC_KEY)
+ endif 
+ 
+-ifeq (intel64,$(arch))
+-CPLUS_FLAGS += -m64
+-LIB_LINK_FLAGS += -m64
+-endif 
+-
+-ifeq (ia32,$(arch))
+-CPLUS_FLAGS += -m32
+-LIB_LINK_FLAGS += -m32
+-endif 
+-
+ 
#--
+ # Setting assembler data.
+ 
#--
+ ASSEMBLY_SOURCE=$(arch)-gas
+ ifeq (ia64,$(arch))
+-ASM=as
++ASM=$(AS)
+ TBB_ASM.OBJ = atomic_support.o lock_byte.o log2.o pause.o
+ MALLOC_ASM.OBJ = atomic_support.o lock_byte.o pause.o
+ endif 
+diff --git a/build/linux.clang.inc b/build/linux.clang.inc
+index fc8d7de..21ad5d4 100644
+--- a/build/linux.clang.inc
 b/build/linux.clang.inc
+@@ -31,15 +31,15 @@ DYLIB_KEY = -shared
+ EXPORT_KEY = -Wl,--version-script,
+ LIBDL = -ldl
+ 
+-CPLUS = clang++
+-CONLY = clang
++CPLUS := $(CXX)
++CONLY := $(CC)
+ LIB_LINK_FLAGS = $(DYLIB_KEY) -Wl,-soname=$(BUILDING_LIBRARY)
+ LIBS += -lpthread -lrt
+ LINK_FLAGS = -Wl,-rpath-link=. -rdynamic
+ C_FLAGS = $(CPLUS_FLAGS)
+ 
+ ifeq ($(cfg), release)
+-CPLUS_FLAGS = $(ITT_NOTIFY) -g -O2 -DUSE_PTHREAD
++CPLUS_FLAGS = $(ITT_NOTIFY) -g -DUSE_PTHREAD
+ endif
+ ifeq ($(cfg), debug)
+ CPLUS_FLAGS = -DTBB_USE_DEBUG $(ITT_NOTIFY) -g -O0 -DUSE_PTHREAD
+@@ -55,24 +55,10 @@ MALLOC_ASM.OBJ=
+ 
+ ifeq (intel64,$(arch))
+ ITT_NOTIFY = -DDO_ITT_NOTIFY
+-CPLUS_FLAGS += -m64
+-LIB_LINK_FLAGS += -m64
+ endif
+ 
+ ifeq (ia32,$(arch))
+ ITT_NOTIFY = -DDO_ITT_NOTIFY
+-CPLUS_FLAGS += -m32 -march=pentium4
+-LIB_LINK_FLAGS += -m32
+-endif
+-
+-ifeq (ppc64,$(arch))
+-CPLUS_FLAGS += -m64
+-LIB_LINK_FLAGS += -m64
+-endif
+-
+-ifeq (ppc32,$(arch))
+-CPLUS_FLAGS += -m32
+-LIB_LINK_FLAGS += -m32
+ endif
+ 
+ ifeq (bg,$(arch))
+@@ -84,12 +70,6 @@ endif
+ # Setting assembler data.
+