<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f5e43ce258507b32d3b9145ce69792fdc901a0c5">https://github.com/macports/macports-ports/commit/f5e43ce258507b32d3b9145ce69792fdc901a0c5</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f5e43ce258507b32d3b9145ce69792fdc901a0c5
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Jul 14 08:48:34 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> py-pyside py-pyside-tools py-shiboken: reorder code
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> PortGroup cmake now uses build.cmd in configure.args
</span><span style='display:block; white-space:pre;color:#404040;'> (see https://github.com/macports/macports-ports/commit/63c9c8e6e312c8e36603cb118d94f995aa8a6e67).
</span><span style='display:block; white-space:pre;color:#404040;'> PortGroup python changes defualt buld.cmd.
</span><span style='display:block; white-space:pre;color:#404040;'> This Portfile does not use default build.cmake.
</span><span style='display:block; white-space:pre;color:#404040;'> Therefore, build.cmd must be set before configure.args is modified
</span>---
python/py-pyside-tools/Portfile | 4 +++-
python/py-pyside/Portfile | 4 +++-
python/py-shiboken/Portfile | 4 +++-
3 files changed, 9 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pyside-tools/Portfile b/python/py-pyside-tools/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 028269a..764b7bd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pyside-tools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pyside-tools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,10 +33,12 @@ if {${name} ne ${subport}} {
</span> }
depends_lib-append port:py${python.version}-pyside port:python${python.version}
use_configure yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # build.cmd must be set before configure.args is changed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # (see https://github.com/macports/macports-ports/commit/63c9c8e6e312c8e36603cb118d94f995aa8a6e67)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.cmd make
</span> configure.args-append -DBUILD_TESTS:BOOL=FALSE \
-DPYTHON_EXECUTABLE=${python.bin} \
-DSITE_PACKAGE=${python.pkgd}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.cmd make
</span> build.target all
destroot.cmd make
destroot.destdir DESTDIR=${destroot}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pyside/Portfile b/python/py-pyside/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0fea5b2..015120c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pyside/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pyside/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,11 +33,13 @@ if {${name} ne ${subport}} {
</span> depends_lib-append port:py${python.version}-shiboken
use_configure yes
configure.env-append CMAKE_PREFIX_PATH=${python.prefix}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # build.cmd must be set before configure.args is changed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # (see https://github.com/macports/macports-ports/commit/63c9c8e6e312c8e36603cb118d94f995aa8a6e67)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.cmd make
</span> configure.args-append -DBUILD_TESTS:BOOL=FALSE \
-DSITE_PACKAGE=${python.pkgd} \
-DPYTHONBRANCH=${python.branch} \
-DPYTHONPREFIX=${python.prefix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.cmd make
</span> build.target all
destroot.cmd make
destroot.destdir DESTDIR=${destroot}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-shiboken/Portfile b/python/py-shiboken/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7d1bcdb..dc9415a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-shiboken/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-shiboken/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,6 +38,9 @@ if {${name} ne ${subport}} {
</span> port:libxslt \
port:sparsehash
use_configure yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # build.cmd must be set before configure.args is changed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # (see https://github.com/macports/macports-ports/commit/63c9c8e6e312c8e36603cb118d94f995aa8a6e67)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.cmd make
</span> configure.args-append -DBUILD_TESTS:BOOL=FALSE \
-DPYTHON_EXECUTABLE=${python.bin} \
-DPYTHON_LIBRARIES=${python.lib} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +52,6 @@ if {${name} ne ${subport}} {
</span> if {${python.version} >= 30} {
configure.args-append -DUSE_PYTHON3:BOOL=TRUE -DPYTHON3_LIBRARY=${python.lib} -DPYTHON3_INCLUDE_DIR=${python.include}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.cmd make
</span> build.target all
destroot.cmd make
destroot.destdir DESTDIR=${destroot}
</pre><pre style='margin:0'>
</pre>