<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/34d40d2fb82804fd67f2d8250da96d81d6077f78">https://github.com/macports/macports-ports/commit/34d40d2fb82804fd67f2d8250da96d81d6077f78</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 34d40d2 devel/boost: make boost-numpy extension a subport to reduce the large number of dependencies that are being pulled in
</span>34d40d2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 34d40d2fb82804fd67f2d8250da96d81d6077f78
</span>Author: Mark Moll <mmoll@macports.org>
AuthorDate: Mon Mar 19 16:51:53 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> devel/boost: make boost-numpy extension a subport to reduce the large number of dependencies that are being pulled in
</span>---
devel/boost/Portfile | 114 +++++++++++++++------
.../boost/files/patch-disable-numpy-extension.diff | 22 ++++
2 files changed, 103 insertions(+), 33 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 ba0385f..e3d287e 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,11 +4,13 @@ PortSystem 1.0
</span> PortGroup compiler_blacklist_versions 1.0
PortGroup mpi 1.0
PortGroup cxx11 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup active_variants 1.1
</span>
name boost
version 1.66.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Revision is set below in the `if {$subport eq $name} { ... }` statement
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# The boost-numpy subport has its own revision number
</span> checksums rmd160 ee5dafdfa49adf50a5333cef1f55dac4f70b4c14 \
sha256 5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9 \
size 85995778
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -211,7 +213,7 @@ foreach s ${pythons_suffixes} {
</span> # The issue has been reported to both the MacPorts team and the boost team, as per:
# <http://trac.macports.org/ticket/23667> and <https://svn.boost.org/trac/boost/ticket/4461>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${p} port:py${s}-numpy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${p}
</span> configure.args-delete --without-libraries=python
configure.args-append --with-python=${prefix}/bin/python${v} --with-python-root=${prefix}/bin/python${v}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -251,51 +253,97 @@ variant no_single description {Disable building single-threaded libraries} {
</span> build.args-append threading=multi
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant regex_match_extra description \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport boost-numpy {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description Boost.Numpy library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description ${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib port:boost
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach s ${pythons_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset python${s}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py${s}-numpy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants boost python${s}
</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;'>+ if {[variant_isset no_static]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants boost no_static
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants boost "" no_static
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset no_single]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants boost no_single
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants boost "" no_single
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {$subport eq $name} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 3
</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:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant regex_match_extra description \
</span> "Enable access to extended capture information of submatches in Boost.Regex" {
<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;'>+ 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>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-http://www.boost.org/doc/libs/${distver}/libs/regex/doc/html/boost_regex/ref/sub_match.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ http://www.boost.org/doc/libs/${distver}/libs/regex/doc/html/boost_regex/ref/sub_match.html
</span> "
<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:#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:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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}/include/boost/python/numpy*]
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[mpi_variant_isset]} {
</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;'>+ # 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;'>- configure.args-delete --without-libraries=mpi
</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;'>- 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;'>+ 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;'>- if {![catch python_dir]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![catch python_dir]} {
</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;'>+ patchfiles-append patch-libs-mpi-build-Jamfile.v2.diff
</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;'>+ 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:#ffe0e0;'>- set l ${site_packages}/boost/mpi.so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}${prefix}/lib/mpi.so ${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:#e0ffe0;'>+ set l ${site_packages}/boost/mpi.so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${destroot}${prefix}/lib/mpi.so ${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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move {*}[glob ${destroot}${prefix}/lib/libboost_numpy*] ${destroot}${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move {*}[glob ${destroot}${prefix}/include/boost/python/numpy*] ${destroot}${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if an mpi variant *and* a python variant is selected, then a binary
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # python module called mpi.so gets installed, so delete ${frameworks_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${prefix}${frameworks_dir} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/share
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file mkdir ${destroot}${prefix}/lib ${destroot}${prefix}/include/boost/python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move {*}[glob ${destroot}${prefix}/libboost_numpy*] ${destroot}${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move {*}[glob ${destroot}${prefix}/numpy*] ${destroot}${prefix}/include/boost/python
</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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..34f4e84
</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-disable-numpy-extension.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tools/build/src/tools/python.jam.orig 2018-02-12 14:59:36.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tools/build/src/tools/python.jam 2018-02-12 15:11:25.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -841,18 +841,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ local full-cmd = $(interpreter-cmd)" -c \"$(full-cmd)\"" ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ debug-message "running command '$(full-cmd)'" ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ local result = [ SHELL $(full-cmd) : strip-eol : exit-status ] ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if $(result[2]) = 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .numpy = true ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .numpy-include = $(result[1]) ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- debug-message "NumPy enabled" ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- debug-message "NumPy disabled. Reason:" ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- debug-message " $(full-cmd) aborted with " ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- debug-message " $(result[1])" ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ debug-message "NumPy disabled." ;
</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;'>+ # End autoconfiguration sequence.
</span></pre><pre style='margin:0'>
</pre>