<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3e6414902dba8fc5cfa0c69066df92fe21cd1de7">https://github.com/macports/macports-ports/commit/3e6414902dba8fc5cfa0c69066df92fe21cd1de7</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 3e64149 tbb: add fixes for snowleopard and earlier
</span>3e64149 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3e6414902dba8fc5cfa0c69066df92fe21cd1de7
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Thu Oct 26 17:31:28 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> tbb: add fixes for snowleopard and earlier
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> block malloc functions missing prior to 10.7
</span><span style='display:block; white-space:pre;color:#404040;'> closes https://trac.macports.org/ticket/44941
</span><span style='display:block; white-space:pre;color:#404040;'> closes https://trac.macports.org/ticket/55180
</span>---
devel/tbb/Portfile | 4 +++-
devel/tbb/files/patch-tbb-older-malloc.diff | 28 ++++++++++++++++++++++++++++
2 files changed, 31 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/tbb/Portfile b/devel/tbb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 04d1782..f279884 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/tbb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/tbb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +28,7 @@ use_configure no
</span> # Force a compatible compiler
compiler.blacklist-append *gcc* {clang < 602} macports-clang-3.3 macports-clang-3.4 \
macports-clang-3.5 macports-clang-3.6 macports-clang-3.7
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.whitelist clang macports-clang-3.9 macports-clang-3.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.whitelist clang macports-clang-3.9 macports-clang-3.8
</span>
set tbb_arch(i386) ia32
set tbb_arch(ppc) ppc32
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,6 +45,8 @@ if {[string match *clang* ${configure.compiler}]} {
</span>
set tbb_build_prefix macports
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-tbb-older-malloc.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
reinplace "/^CONLY *=/s|=.*$|= ${configure.cc}|g" ${worksrcpath}/build/macos.${tbb_compiler}.inc
reinplace "/^CPLUS *=/s|=.*$|= ${configure.cxx}|g" ${worksrcpath}/build/macos.${tbb_compiler}.inc
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/tbb/files/patch-tbb-older-malloc.diff b/devel/tbb/files/patch-tbb-older-malloc.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..16d6078
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/tbb/files/patch-tbb-older-malloc.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,28 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/tbbmalloc/proxy_overload_osx.h src/tbbmalloc/proxy_overload_osx.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 53afe13..98f622d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/tbbmalloc/proxy_overload_osx.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/tbbmalloc/proxy_overload_osx.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -139,10 +139,11 @@ struct DoMallocReplacement {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ introspect.force_unlock = &zone_force_unlock;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ introspect.statistics = zone_statistics;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ introspect.zone_locked = &zone_locked;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ introspect.enable_discharge_checking = &impl_zone_enable_discharge_checking;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ introspect.disable_discharge_checking = &impl_zone_disable_discharge_checking;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ introspect.discharge = &impl_zone_discharge;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zone.size = &impl_malloc_usable_size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zone.malloc = &impl_malloc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zone.calloc = &impl_calloc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -155,8 +156,9 @@ struct DoMallocReplacement {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zone.version = 8;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zone.memalign = impl_memalign;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zone.free_definite_size = &impl_free_definite_size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zone.pressure_relief = &impl_pressure_relief;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // make sure that default purgeable zone is initialized
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ malloc_default_purgeable_zone();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void* ptr = malloc(1);
</span></pre><pre style='margin:0'>
</pre>