<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/c603d5c8548a56ef200071f43a09e696cdbec8a2">https://github.com/macports/macports-ports/commit/c603d5c8548a56ef200071f43a09e696cdbec8a2</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 c603d5c8548 boost: maximize consistency with boost171
</span>c603d5c8548 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c603d5c8548a56ef200071f43a09e696cdbec8a2
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Fri Jun 4 18:57:10 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> boost: maximize consistency with boost171
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Preparation for refactoring shared logic into portgroup
</span>---
devel/boost/Portfile | 43 +++++++++++++++++++++++++------------------
1 file changed, 25 insertions(+), 18 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 3cbbf058ac0..b28cbd83aa8 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;'>@@ -4,9 +4,13 @@ PortSystem 1.0
</span> PortGroup mpi 1.0
PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.71.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set branch [join [lrange [split ${version} .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set tag [string map {. {}} ${branch}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> name boost
<span style='display:block; white-space:pre;background:#ffe0e0;'>-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
checksums rmd160 a46b886ca26993610c84615fca4340ad3f955f81 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +32,7 @@ long_description \
</span> homepage http://www.boost.org
master_sites https://boostorg.jfrog.io/artifactory/main/release/${version}/source/
set distver [join [split ${version} .] _]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${name}_${distver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname boost_${distver}
</span> use_bzip2 yes
depends_lib port:bzip2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,6 +51,9 @@ post-extract {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Install prefix for this port
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set bprefix ${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # patch-apple-clang-no-libcxx.diff fixes a clang configuration error
# that occurs on OS X 10.7 and 10.8 due to the assumption that if
# clang is the compiler in use it must be using libc++. Apple Clang
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -111,7 +118,7 @@ mpi.setup -gcc
</span> # require ports depending on Boost to also require C++11 compliance,
# and requiring it does make such building easier for those ports.
configure.cxxflags-append -std=gnu++11
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2011
</span>
# It turns out that ccache and distcc can produce boost libraries that, although they
# compile without warning, have all sorts of runtime errors especially with pointer corruption.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -138,7 +145,7 @@ configure.universal_args
</span>
post-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "s|-install_name \"|&${prefix}/lib/|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E "s|-install_name \"|&${bprefix}/lib/|" \
</span> ${worksrcpath}/tools/build/src/tools/darwin.jam
set compileflags ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -181,14 +188,14 @@ destroot.cmd ${worksrcpath}/b2
</span> destroot.post_args
pre-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.args {*}${build.args} --prefix=${destroot}${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.args {*}${build.args} --prefix=${destroot}${bprefix}
</span> system "find ${worksrcpath} -type f -name '*.gch' -exec rm {} \\;"
}
proc boost_docs_install {} {
global prefix destroot worksrcpath name
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set docdir ${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set docdir ${bprefix}/share/doc/${name}
</span> xinstall -d ${destroot}${docdir}
set l [expr [string length ${worksrcpath}] + 1]
fs-traverse f [glob -directory ${worksrcpath} *] {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -282,7 +289,7 @@ variant no_single description {Disable building single-threaded libraries} {
</span> build.args-append threading=multi
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport boost-numpy {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${name}-numpy {
</span> revision 2
description Boost.Numpy library
long_description {*}${description}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -331,7 +338,7 @@ if {$subport eq $name} {
</span> }
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- delete file {*}[glob ${destroot}${prefix}/include/boost/python/numpy*]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete file {*}[glob ${destroot}${bprefix}/include/boost/python/numpy*]
</span> }
if {[mpi_variant_isset]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -363,7 +370,7 @@ if {$subport eq $name} {
</span> xinstall -m 644 ${worksrcpath}/libs/mpi/build/__init__.py \
${destroot}${site_packages}/boost
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set f ${destroot}${prefix}/lib/mpi.so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set f ${destroot}${bprefix}/lib/mpi.so
</span> if {[info exists ${f}]} {
set l ${site_packages}/boost/mpi.so
move ${f} ${destroot}${l}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -379,17 +386,17 @@ if {$subport eq $name} {
</span> livecheck.regex Version (\\d+\\.\\d+\\.\\d+)</span>
} else {
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- move {*}[glob ${destroot}${prefix}/lib/libboost_numpy*] ${destroot}${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move {*}[glob ${destroot}${prefix}/include/boost/python/numpy*] ${destroot}${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move {*}[glob ${destroot}${bprefix}/lib/libboost_numpy*] ${destroot}${bprefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move {*}[glob ${destroot}${bprefix}/include/boost/python/numpy*] ${destroot}${bprefix}
</span> # if an mpi variant *and* a python variant is selected, then a binary
# python module called mpi.so gets installed, so delete ${frameworks_dir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${prefix}${frameworks_dir} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/share
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file mkdir ${destroot}${prefix}/lib ${destroot}${prefix}/include/boost/python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move {*}[glob ${destroot}${prefix}/libboost_numpy*] ${destroot}${prefix}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move {*}[glob ${destroot}${prefix}/numpy*] ${destroot}${prefix}/include/boost/python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${bprefix}${frameworks_dir} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${bprefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${bprefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${bprefix}/share
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file mkdir ${destroot}${bprefix}/lib ${destroot}${bprefix}/include/boost/python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move {*}[glob ${destroot}${bprefix}/libboost_numpy*] ${destroot}${bprefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move {*}[glob ${destroot}${bprefix}/numpy*] ${destroot}${bprefix}/include/boost/python
</span> }
livecheck.type none
</pre><pre style='margin:0'>
</pre>