<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b09ef91d8de72290191eb87b0b33641b37e5a5ca">https://github.com/macports/macports-ports/commit/b09ef91d8de72290191eb87b0b33641b37e5a5ca</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b09ef91d8de72290191eb87b0b33641b37e5a5ca
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Thu May 2 10:03:34 2019 -0400
<span style='display:block; white-space:pre;color:#404040;'> boost: update to 1.70.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> 1) tweak current patches to apply cleanly.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> 2) Add a patch to revert the ABI naming to what we have historically had in MacPorts: "libboost_COMPONENT-mt.dylib", where COMPONENT is the component name e.g., "system" or "thread" or the like.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/56294
</span>---
devel/boost/Portfile | 21 ++++++++++++++++-----
devel/boost/files/patch-apple-clang-no-libcxx.diff | 2 +-
devel/boost/files/patch-boost-python3.diff | 20 --------------------
.../boost/files/patch-disable-numpy-extension.diff | 6 +++---
devel/boost/files/patch-revert-lib-name-tagged.diff | 11 +++++++++++
.../patch-tools-build-src-engine-build.sh.diff | 2 +-
6 files changed, 32 insertions(+), 30 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/boost/Portfile b/devel/boost/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 58576be..019e7d6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/boost/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/boost/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,12 +8,12 @@ PortGroup active_variants 1.1
</span>
name boost
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.66.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.70.0
</span> # Revision is set below in the `if {$subport eq $name} { ... }` statement
# The boost-numpy subport has its own revision number
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ee5dafdfa49adf50a5333cef1f55dac4f70b4c14 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 85995778
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 83440e32058f68390b979b88b116daa971f19c86 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 97887058
</span>
license Boost-1
categories devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,6 +72,14 @@ patchfiles patch-tools-build-src-engine-build.sh.diff \
</span>
patchfiles-append patch-export_serialization_explicit_template_instantiations.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# revert the default tagged library name changes in 1.69.0 <
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# libboost_<component>-<threading>-<arch>.dylib > back to 1.68.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# format: libboost_<component>-<threading>.dylib; where <component> is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# the component name (e.g., system, thread), <threading> is either mt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# or st (multi or single), and <arch> is the build arch (x86, x64,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# p64, p32).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-revert-lib-name-tagged.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
reinplace "s|%%CONFIGURE.CC%%|${configure.cc}|g" ${worksrcpath}/tools/build/src/engine/build.jam \
${worksrcpath}/tools/build/src/engine/build.sh
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -155,7 +163,8 @@ build.args -d2 \
</span> threading=single,multi \
link=static,shared \
runtime-link=shared \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -j${build.jobs}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -j${build.jobs} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --no-cmake-config
</span>
destroot.cmd ${worksrcpath}/bjam
destroot.post_args
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -278,7 +287,9 @@ subport boost-numpy {
</span> }
if {$subport eq $name} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> revision 4
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> patchfiles-append patch-disable-numpy-extension.diff
variant regex_match_extra description \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/boost/files/patch-apple-clang-no-libcxx.diff b/devel/boost/files/patch-apple-clang-no-libcxx.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 7fae29e..06ef57d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/boost/files/patch-apple-clang-no-libcxx.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/boost/files/patch-apple-clang-no-libcxx.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- boost/config/compiler/clang.hpp
+++ boost/config/compiler/clang.hpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -236,6 +236,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -248,6 +248,16 @@
</span> # define BOOST_NO_CXX11_INLINE_NAMESPACES
#endif
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/boost/files/patch-boost-python3.diff b/devel/boost/files/patch-boost-python3.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c226b2f..8b88db1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/boost/files/patch-boost-python3.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/boost/files/patch-boost-python3.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,23 +20,3 @@
</span> - import mpi
+ from . import mpi
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- libs/python/src/converter/builtin_converters.cpp.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libs/python/src/converter/builtin_converters.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -45,11 +45,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return PyString_Check(obj) ? PyString_AsString(obj) : 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif PY_VERSION_HEX < 0x03070000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void* convert_to_cstring(PyObject* obj)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return PyUnicode_Check(obj) ? _PyUnicode_AsString(obj) : 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ void* convert_to_cstring(PyObject* obj)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return PyUnicode_Check(obj) ? const_cast<void*>(reinterpret_cast<const void*>(_PyUnicode_AsString(obj))) : 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Given a target type and a SlotPolicy describing how to perform a
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/boost/files/patch-disable-numpy-extension.diff b/devel/boost/files/patch-disable-numpy-extension.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 34f4e84..28d02ba 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/boost/files/patch-disable-numpy-extension.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/boost/files/patch-disable-numpy-extension.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tools/build/src/tools/python.jam.orig 2018-02-12 14:59:36.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tools/build/src/tools/python.jam 2018-02-12 15:11:25.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -841,18 +841,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tools/build/src/tools/python.jam.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tools/build/src/tools/python.jam
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -843,18 +843,7 @@
</span> local full-cmd = $(interpreter-cmd)" -c \"$(full-cmd)\"" ;
debug-message "running command '$(full-cmd)'" ;
local result = [ SHELL $(full-cmd) : strip-eol : exit-status ] ;
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/boost/files/patch-revert-lib-name-tagged.diff b/devel/boost/files/patch-revert-lib-name-tagged.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..9a264a5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/boost/files/patch-revert-lib-name-tagged.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- boostcpp.jam.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ boostcpp.jam
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -163,7 +163,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <base> <threading> <runtime> ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case 1.69 :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .format-name-args =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <base> <threading> <runtime> <arch-and-model> ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <base> <threading> <runtime> ;
</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;background:#e0ffe0;'>+ else if $(layout) = system
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/boost/files/patch-tools-build-src-engine-build.sh.diff b/devel/boost/files/patch-tools-build-src-engine-build.sh.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index bdee542..4ecd772 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/boost/files/patch-tools-build-src-engine-build.sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/boost/files/patch-tools-build-src-engine-build.sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- tools/build/src/engine/build.sh.orig
+++ tools/build/src/engine/build.sh
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -154,7 +154,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -162,7 +162,7 @@
</span> ;;
darwin)
</pre><pre style='margin:0'>
</pre>