<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/49f60837b6376cbddb73140fbd8c4ec35b292a74">https://github.com/macports/macports-ports/commit/49f60837b6376cbddb73140fbd8c4ec35b292a74</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 49f6083 gperftools: Reinstate OS X El Capitan 10.11 patch
</span>49f6083 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 49f60837b6376cbddb73140fbd8c4ec35b292a74
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Mar 9 18:05:19 2018 -0600
<span style='display:block; white-space:pre;color:#404040;'> gperftools: Reinstate OS X El Capitan 10.11 patch
</span>---
devel/gperftools/Portfile | 5 ++++
devel/gperftools/files/patch-build-fix-15.diff | 33 +++++++++++++++-----------
2 files changed, 24 insertions(+), 14 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gperftools/Portfile b/devel/gperftools/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0b95b0c..697032e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gperftools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gperftools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,3 +16,8 @@ github.tarball_from releases
</span> checksums rmd160 9da9dd3e1ba7510c92ec8e261b4670343f0d2f76 \
sha256 314b2ff6ed95cc0763704efb4fb72d0139e1c381069b9e17a619006bee8eee9f \
size 1510420
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin 15 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-build-fix-15.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gperftools/files/patch-build-fix-15.diff b/devel/gperftools/files/patch-build-fix-15.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 06e7a0c..58a51a9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gperftools/files/patch-build-fix-15.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gperftools/files/patch-build-fix-15.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig 2016-03-12 19:46:15.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2017-05-13 10:07:08.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -351,16 +351,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/gperftools/gperftools/issues/794
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2017-12-09 11:43:20.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2018-03-09 18:01:04.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -366,18 +366,19 @@
</span> [AC_MSG_NOTICE([Will build dynamically detected sized deallocation operators])],
[AC_MSG_NOTICE([Will not build sized deallocation operators])])])
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,9 +10,11 @@
</span> - [AC_LANG_PUSH(C++)
- OLD_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -fsized-deallocation"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,)],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- perftools_cv_sized_deallocation_result=yes,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- perftools_cv_sized_deallocation_result=no)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [[#include <new>]],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [[(::operator delete)(0, 256)]])],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- perftools_cv_sized_deallocation_result=yes,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- perftools_cv_sized_deallocation_result=no)
</span> - CXXFLAGS="$OLD_CXXFLAGS"
- AC_LANG_POP(C++)])
+AS_IF([test "x$enable_sized_delete" = xyes -o "x$enable_dyn_sized_delete" = xyes],
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,7 +23,9 @@
</span> + [AC_LANG_PUSH(C++)
+ OLD_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS="$CXXFLAGS -fsized-deallocation"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,)],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [[#include <new>]],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [[(::operator delete)(0, 256)]])],
</span> + perftools_cv_sized_deallocation_result=yes,
+ perftools_cv_sized_deallocation_result=no)
+ CXXFLAGS="$OLD_CXXFLAGS"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,19 +33,19 @@
</span>
AM_CONDITIONAL(HAVE_SIZED_DEALLOCATION,
test "$perftools_cv_sized_deallocation_result" = yes)
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/libc_override_gcc_and_weak.h.orig 2016-03-06 01:11:39.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/libc_override_gcc_and_weak.h 2017-05-13 10:07:08.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -127,13 +127,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void operator delete[](void *p, size_t size) throw()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/libc_override_gcc_and_weak.h.orig 2017-12-09 10:29:18.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/libc_override_gcc_and_weak.h 2018-03-09 18:03:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -123,13 +123,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void operator delete[](void *p, size_t size) CPP_NOTHROW
</span> __attribute__((ifunc("resolve_deletearray_sized")));
-#else /* !ENABLE_SIZED_DELETE && !ENABLE_DYN_SIZED_DELETE */
-
<span style='display:block; white-space:pre;background:#ffe0e0;'>--void operator delete(void *p, size_t size) throw()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-void operator delete(void *p, size_t size) CPP_NOTHROW
</span> - ALIAS(tc_delete);
<span style='display:block; white-space:pre;background:#ffe0e0;'>--void operator delete[](void *p, size_t size) throw()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-void operator delete[](void *p, size_t size) CPP_NOTHROW
</span> - ALIAS(tc_deletearray);
-
#endif /* !ENABLE_SIZED_DELETE && !ENABLE_DYN_SIZED_DELETE */
<span style='display:block; white-space:pre;background:#ffe0e0;'>- extern "C" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(ENABLE_ALIGNED_NEW_DELETE)
</span></pre><pre style='margin:0'>
</pre>