<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bc65b4e82353d6a6d40cdf8917feb0958b52ccff">https://github.com/macports/macports-ports/commit/bc65b4e82353d6a6d40cdf8917feb0958b52ccff</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 bc65b4e boost: update to 1.71.0
</span>bc65b4e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bc65b4e82353d6a6d40cdf8917feb0958b52ccff
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Thu Aug 22 12:56:51 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> boost: update to 1.71.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove now-unnecessary patches.
</span><span style='display:block; white-space:pre;color:#404040;'> Add non-default variant to install Boost-provided CMake find scripts.
</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/58856
</span>---
devel/boost/Portfile | 55 ++++++++++++----------
.../patch-tools-build-src-engine-build.jam.diff | 11 -----
.../patch-tools-build-src-engine-build.sh.diff | 11 -----
3 files changed, 30 insertions(+), 47 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 a1b51ba..9e3df84 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.70.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.71.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 83440e32058f68390b979b88b116daa971f19c86 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 97887058
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a46b886ca26993610c84615fca4340ad3f955f81 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 100124647
</span>
license Boost-1
categories devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,21 +47,19 @@ post-extract {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-tools-build-src-engine-build.sh.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-tools-build-src-engine-build.jam.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-apple-clang-no-libcxx.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # patch-apple-clang-no-libcxx.diff fixes a clang configuration
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # error that occurs on OS X 10.7 and 10.8 due to the assumption
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # that if clang is the compiler in use it must be using libc++.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Apple Clang uses libstdc++ by default on these OS versions.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The patch adds an additional BOOST_* configuration flag
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # that is set if Apple clang is being used but libc++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # is not. This flag is then used to prevent boost or a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # dependent package from using functions such as std::forward that
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # are only available in libc++. Fixes build of libcdr on these
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # OS versions without affecting build on 10.6 and less (where clang is not
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # the default compiler) or 10.9 and up (where libc++ is the default).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# patch-apple-clang-no-libcxx.diff fixes a clang configuration error
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# that occurs on OS X 10.7 and 10.8 due to the assumption that if
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# clang is the compiler in use it must be using libc++. Apple Clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# uses libstdc++ by default on these OS versions. The patch adds an
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# additional BOOST_* configuration flag that is set if Apple clang is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# being used but libc++ is not. This flag is then used to prevent
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# boost or a dependent package from using functions such as
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# std::forward that are only available in libc++. Fixes build of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# libcdr on these OS versions without affecting build on 10.6 and less
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (where clang is not the default compiler) or 10.9 and up (where
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# libc++ is the default).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-apple-clang-no-libcxx.diff
</span>
# temporary patch to fix: explicit template instanciations in
# boost::serialization don't get exported with all compilers; this fix
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,11 +78,6 @@ patchfiles-append patch-export_serialization_explicit_template_instantiations.di
</span> # p64, p32).
patchfiles-append patch-revert-lib-name-tagged.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|%%CONFIGURE.CC%%|${configure.cc}|g" ${worksrcpath}/tools/build/src/engine/build.jam \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/tools/build/src/engine/build.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> proc write_jam s {
global worksrcpath
set config [open ${worksrcpath}/user-config.jam a]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -166,7 +159,7 @@ build.args -d2 \
</span> -j${build.jobs} \
--no-cmake-config
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.cmd ${worksrcpath}/bjam
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.cmd ${worksrcpath}/b2
</span> destroot.post_args
pre-destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -437,3 +430,15 @@ platform darwin 8 powerpc {
</span> build.args-append macosx-version=10.4
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# As of Boost 1.70.0, Boost provides CMake find scripts for itself
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# that are installed by default. Those provided in 1.70.0 were broken
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# in multiple ways; many fixed were added before 1.71.0. That said,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# we're not installing them by default at this time, but instead
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# providing an option to install them for testing / evaluation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# purposes. We will likely enable these scripts in the future since it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# is likely that CMake will stop providing them once the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Boost-provided version is stable.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant cmake_scripts description {Install Boost CMake find scripts} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-delete --no-cmake-config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/boost/files/patch-tools-build-src-engine-build.jam.diff b/devel/boost/files/patch-tools-build-src-engine-build.jam.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 60e9313..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/boost/files/patch-tools-build-src-engine-build.jam.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tools/build/src/engine/build.jam.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tools/build/src/engine/build.jam
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -206,7 +206,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -I$(--python-include) -I$(--extra-include)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- : -L$(--python-lib[1]) -l$(--python-lib[2]) ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## MacOSX Darwin, using GCC 2.9.x, 3.x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--toolset darwin cc : "-o " : -D
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+toolset darwin %%CONFIGURE.CC%% : "-o " : -D
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [ opt --release : -Wl,-x -O3 -finline-functions ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [ opt --debug : -g -O0 -fno-inline -pg ]
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4ecd772..0000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tools/build/src/engine/build.sh.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tools/build/src/engine/build.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -162,7 +162,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- darwin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- BOOST_JAM_CC=cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ BOOST_JAM_CC=%%CONFIGURE.CC%%
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- intel-darwin)
</span></pre><pre style='margin:0'>
</pre>