<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5a0495151588376a83dec52725dbb7e2f5fed32a">https://github.com/macports/macports-ports/commit/5a0495151588376a83dec52725dbb7e2f5fed32a</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 5a049515158 onetbb: update to 2021.10.0
</span>5a049515158 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5a0495151588376a83dec52725dbb7e2f5fed32a
</span>Author: Mohamed Akram <mohd.akram@outlook.com>
AuthorDate: Fri Jul 28 20:14:39 2023 +0400
<span style='display:block; white-space:pre;color:#404040;'> onetbb: update to 2021.10.0
</span>---
devel/onetbb/Portfile | 15 ++++----
devel/onetbb/files/patch-cmake-compilers.diff | 43 ++++++++++++++++++++++
.../onetbb/files/patch-onetbb-older-platforms.diff | 14 -------
3 files changed, 51 insertions(+), 21 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/onetbb/Portfile b/devel/onetbb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 662967e6814..da81f42f8d6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/onetbb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/onetbb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,11 +5,11 @@ PortGroup github 1.0
</span> PortGroup cmake 1.1
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup oneapi-src oneTBB 2021.9.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup oneapi-src oneTBB 2021.10.0 v
</span> github.tarball_from archive
name onetbb
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories devel parallel
platforms darwin
license Apache-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,11 +21,12 @@ long_description oneTBB is a flexible C++ library that simplifies the work \
</span> of adding parallelism to complex applications, even if you \
are not a threading expert.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 512a17da62b94d14a4ac4d0c5482557c90643ed6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 1ce48f34dada7837f510735ff1172f6e2c261b09460e3bf773b49791d247d24e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2579150
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 fc57007d0d3ef1c2e36fca724790c29e7387ac2f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 487023a955e5a3cc6d3a0d5f89179f9b6c0ae7222613a7185b0227ba0c83700b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2598088
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-onetbb-older-platforms.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-onetbb-older-platforms.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-cmake-compilers.diff
</span>
compiler.blacklist-append {clang < 700}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,7 +53,7 @@ configure.args-append -DTBB_TEST=OFF
</span>
# install it into libexec to avoid conflict with tbb port
cmake.install_prefix ${prefix}/libexec/${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# but keep this port at perfix's cmake's lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# but keep this port at prefix's cmake's lib
</span> post-destroot {
xinstall -d -m 0755 ${destroot}${prefix}/lib/cmake
foreach cmakedir [glob -type d -nocomplain -tails -directory ${destroot}${cmake.install_prefix}/lib/cmake *] {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/onetbb/files/patch-cmake-compilers.diff b/devel/onetbb/files/patch-cmake-compilers.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e042a4f011d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/onetbb/files/patch-cmake-compilers.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,43 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 539cbb3e67f8cde4b54c767626e015997755770b Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Ilya Isaev <ilya.isaev@intel.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 27 Jul 2023 10:04:09 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Remove unsupported -z switch while compiling on MacOS (#1150)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Isaev, Ilya <ilya.isaev@intel.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake/compilers/Clang.cmake | 5 ++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake/compilers/GNU.cmake | 5 ++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 8 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/cmake/compilers/Clang.cmake b/cmake/compilers/Clang.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a128e13364..0de86e5fec 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/compilers/Clang.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/compilers/Clang.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -52,7 +52,10 @@ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Clang flags to prevent compiler from optimizing out security checks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -Wformat -Wformat-security -Werror=format-security
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -fstack-protector-strong -fPIC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set(TBB_LIB_LINK_FLAGS ${TBB_LIB_LINK_FLAGS} -Wl,-z,relro,-z,now)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# -z switch is not supported on MacOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if (NOT APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(TBB_LIB_LINK_FLAGS ${TBB_LIB_LINK_FLAGS} -Wl,-z,relro,-z,now)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(TBB_COMMON_LINK_LIBS ${CMAKE_DL_LIBS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/cmake/compilers/GNU.cmake b/cmake/compilers/GNU.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ea939ffd47..08c7f2e530 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/compilers/GNU.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/compilers/GNU.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -71,7 +71,10 @@ endif ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -fno-strict-overflow -fno-delete-null-pointer-checks -fwrapv)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -Wformat -Wformat-security -Werror=format-security
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -fstack-protector-strong )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set(TBB_LIB_LINK_FLAGS ${TBB_LIB_LINK_FLAGS} -Wl,-z,relro,-z,now,-z,noexecstack)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# -z switch is not supported on MacOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if (NOT APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(TBB_LIB_LINK_FLAGS ${TBB_LIB_LINK_FLAGS} -Wl,-z,relro,-z,now,-z,noexecstack)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} $<$<NOT:$<CONFIG:Debug>>:-D_FORTIFY_SOURCE=2> )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/onetbb/files/patch-onetbb-older-platforms.diff b/devel/onetbb/files/patch-onetbb-older-platforms.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 1af29bbb7d3..6a5d15dec0a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/onetbb/files/patch-onetbb-older-platforms.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/onetbb/files/patch-onetbb-older-platforms.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -511,20 +511,6 @@ index 69582983..bf4df54f 100644
</span>
// make sure that default purgeable zone is initialized
malloc_default_purgeable_zone();
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git test/common/doctest.h test/common/doctest.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 3b906764..0d349aa9 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- test/common/doctest.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ test/common/doctest.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -412,6 +412,9 @@ DOCTEST_MSVC_SUPPRESS_WARNING(26812) // Prefer 'enum class' over 'enum'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(DOCTEST_PLATFORM_MAC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(__x86_64) || defined(__x86_64__) || defined(__amd64__) || defined(__i386)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define DOCTEST_BREAK_INTO_DEBUGGER() __asm__("int $3\n" : :) // NOLINT (hicpp-no-assembler)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif defined(__POWERPC__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define DOCTEST_BREAK_INTO_DEBUGGER() __asm__("li r0, 20\nsc\nnop\nli r0, 37\nli r4, 2\nsc\nnop\n" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ : : : "memory","r0","r3","r4" ) /* NOLINT */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define DOCTEST_BREAK_INTO_DEBUGGER() __asm__("brk #0"); // NOLINT (hicpp-no-assembler)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span> diff --git test/conformance/conformance_allocators.cpp test/conformance/conformance_allocators.cpp
index 60ec5cae..0c1b9a6c 100644
--- test/conformance/conformance_allocators.cpp
</pre><pre style='margin:0'>
</pre>