<pre style='margin:0'>
Zero King (l2dy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/df0e28fb49e34652b975e0f68a20fa4672d79314">https://github.com/macports/macports-ports/commit/df0e28fb49e34652b975e0f68a20fa4672d79314</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 df0e28f weechat: refactor python variants
</span>df0e28f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit df0e28fb49e34652b975e0f68a20fa4672d79314
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Sat Dec 7 19:31:30 2019 +0000
<span style='display:block; white-space:pre;color:#404040;'> weechat: refactor python variants
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/59819
</span>---
irc/weechat/Portfile | 22 ++++++++--------------
1 file changed, 8 insertions(+), 14 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/irc/weechat/Portfile b/irc/weechat/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d47a5e6..9897df8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/irc/weechat/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/irc/weechat/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,6 +58,7 @@ platforms darwin
</span> depends_build-append \
port:asciidoctor \
port:libxslt \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig \
</span> port:docbook-xsl-nons
depends_lib-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,29 +93,22 @@ variant python requires python27 description {Compatibility variant, requires +p
</span> variant python27 description "Bindings for python 2.7 plugins" conflicts python36 {
configure.args-replace -DENABLE_PYTHON=OFF -DENABLE_PYTHON=ON
configure.args-replace -DENABLE_PYTHON2=OFF -DENABLE_PYTHON2=ON
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DPYTHON_EXECUTABLE=${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DPYTHON_INCLUDE_PATH=${frameworks_dir}/Python.framework/Versions/2.7/Headers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DPYTHON_LIBRARY=${frameworks_dir}/Python.framework/Versions/2.7/Python
</span> depends_lib-append port:python27
}
variant python36 description "Bindings for python 3.6 plugins" conflicts python27 {
configure.args-replace -DENABLE_PYTHON=OFF -DENABLE_PYTHON=ON
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DPYTHON_EXECUTABLE=${prefix}/bin/python3.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DPYTHON_INCLUDE_PATH=${frameworks_dir}/Python.framework/Versions/3.6/Headers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DPYTHON_LIBRARY=${frameworks_dir}/Python.framework/Versions/3.6/Python
</span> depends_lib-append port:python36
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset python27] || [variant_isset python36]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set patchfile ${configure.dir}/src/plugins/python/CMakeFiles/python.dir/link.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set patchfile ${worksrcpath}/cmake/FindPython.cmake
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "s| \(Python.framework\)| ${frameworks_dir}/\\1|g" ${patchfile}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset python36]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "s|-Wl,-stack_size,1000000||" ${patchfile}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset python27]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E "s|PYTHON python2|PYTHON python-2.7|g" ${patchfile}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset python36]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E "s|PYTHON python3|PYTHON python-3.6|g" ${patchfile}
</span> }
}
</pre><pre style='margin:0'>
</pre>