<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/8a9cd96e869ec661459ddc735c813d077e21bbba">https://github.com/macports/macports-ports/commit/8a9cd96e869ec661459ddc735c813d077e21bbba</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 8a9cd96e869ec661459ddc735c813d077e21bbba
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Mon May 31 13:42:08 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> boost169: backport variant docs, from boost
</span>---
devel/boost169/Portfile | 95 +++++++++++++++++++++++++++----------------------
1 file changed, 53 insertions(+), 42 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/boost169/Portfile b/devel/boost169/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ffc016efbd8..d5c60342551 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/boost169/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/boost169/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -174,7 +174,9 @@ pre-destroot {
</span> system "find ${worksrcpath} -type f -name '*.gch' -exec rm {} \\;"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc boost_docs_install {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global prefix destroot worksrcpath name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set docdir ${prefix}/share/doc/${name}
xinstall -d ${destroot}${docdir}
set l [expr [string length ${worksrcpath}] + 1]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -192,6 +194,12 @@ post-destroot {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset docs]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ boost_docs_install
</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;'>+
</span> set pythons_suffixes {27 37}
set pythons_ports {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -263,66 +271,69 @@ variant no_single description {Disable building single-threaded libraries} {
</span> build.args-append threading=multi
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-disable-numpy-extension.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-disable-numpy-extension.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant regex_match_extra description \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "Enable access to extended capture information of submatches in Boost.Regex" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- notes-append "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- You enabled the +regex_match_extra variant\; see the following page for an\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exhaustive list of the consequences of this feature:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant regex_match_extra description \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "Enable access to extended capture information of submatches in Boost.Regex" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes-append "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ You enabled the +regex_match_extra variant\; see the following page for an\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exhaustive list of the consequences of this feature:
</span>
http://www.boost.org/doc/libs/${distver}/libs/regex/doc/html/boost_regex/ref/sub_match.html
"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {/#define BOOST_REGEX_MATCH_EXTRA/s:^// ::} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/boost/regex/user.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {/#define BOOST_REGEX_MATCH_EXTRA/s:^// ::} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/boost/regex/user.hpp
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete file {*}[glob ${destroot}${prefix}/libexec/${name}/include/boost/python/numpy*]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant docs description {Enable building documentation} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # No configure changes, etc; we simply check 'variant_isset' elsewhere
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[mpi_variant_isset]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete file {*}[glob ${destroot}${prefix}/libexec/${name}/include/boost/python/numpy*]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://trac.macports.org/ticket/49748
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see http://www.openradar.me/25313838
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-append -Lstage/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[mpi_variant_isset]} {
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # There is a conflict with debug support.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The issue has been reported to both the MacPorts team and the boost team, as per:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # <http://trac.macports.org/ticket/23667> and <https://svn.boost.org/trac/boost/ticket/4461>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset debug]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "+debug variant conflicts with mpi"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/49748
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see http://www.openradar.me/25313838
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append -Lstage/lib
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --without-libraries=mpi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # There is a conflict with debug support.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The issue has been reported to both the MacPorts team and the boost team, as per:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # <http://trac.macports.org/ticket/23667> and <https://svn.boost.org/trac/boost/ticket/4461>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset debug]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "+debug variant conflicts with mpi"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- write_jam "using mpi : ${mpi.cxx} : : ${mpi.exec} ;"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --without-libraries=mpi
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![catch python_dir]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ write_jam "using mpi : ${mpi.cxx} : : ${mpi.exec} ;"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-libs-mpi-build-Jamfile.v2.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![catch python_dir]} {
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set site_packages [python_dir]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${site_packages}/boost
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/libs/mpi/build/__init__.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${site_packages}/boost
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-libs-mpi-build-Jamfile.v2.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set f ${destroot}${prefix}/libexec/${name}/lib/mpi.so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[info exists ${f}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set l ${site_packages}/boost/mpi.so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${f} ${destroot}${l}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "install_name_tool -id ${l} ${destroot}${l}"
</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:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set site_packages [python_dir]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${site_packages}/boost
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 ${worksrcpath}/libs/mpi/build/__init__.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${site_packages}/boost
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set f ${destroot}${prefix}/libexec/${name}/lib/mpi.so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[info exists ${f}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set l ${site_packages}/boost/mpi.so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${f} ${destroot}${l}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -id ${l} ${destroot}${l}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
livecheck.type none
</pre><pre style='margin:0'>
</pre>