<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/5ff8747a2474ee752e38608a3efa031213ff4ff4">https://github.com/macports/macports-ports/commit/5ff8747a2474ee752e38608a3efa031213ff4ff4</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 5ff8747 py-sip: various fixes and tweaks for correctness and brevity
</span>5ff8747 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5ff8747a2474ee752e38608a3efa031213ff4ff4
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Wed Mar 13 17:22:22 2019 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-sip: various fixes and tweaks for correctness and brevity
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/58195
</span>---
python/py-sip/Portfile | 72 ++++++++++++++++++++++++++------------------------
1 file changed, 38 insertions(+), 34 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-sip/Portfile b/python/py-sip/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 14472d3..2ed1f73 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-sip/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-sip/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,9 +53,6 @@ epoch 1
</span> # SIP 4.16.[1-7] provides SIP API 11.1.
# SIP 4.15.5 provided SIP API 11.0.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set branch [join [lrange [split ${version} .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set patch [lindex [split ${version} .] 2]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> python.versions 27 34 35 36 37
python.default_version 27
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,6 +60,9 @@ if {${name} ne ${subport}} {
</span>
master_sites https://www.riverbankcomputing.com/static/Downloads/sip
<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 patch [lindex [split ${version} .] 2]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${patch} == 0} {
distname sip-${branch}
} else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,7 +72,7 @@ if {${name} ne ${subport}} {
</span> checksums rmd160 28828375061b49a42ef911873c5d6fa700c37bbf \
sha256 0ef3765dbcc3b8131f83e60239f49508f82205b33cae5408c405e2e2f2d0af87 \
size 1049688
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span>
patchfiles patch-siputils.py.diff \
patch-specs_macx-g++.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,6 +80,7 @@ if {${name} ne ${subport}} {
</span> patch-add_ppc64.diff
use_configure yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> pre-configure {
# Ensure correct compilers are used
reinplace "s|@CC@|${configure.cc}|" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,25 +89,15 @@ if {${name} ne ${subport}} {
</span> ${worksrcpath}/specs/macx-g++
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # fix sip bin name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|bin/sip|bin/sip-${python.branch}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/sipconfig.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.cmd ${python.bin} configure.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pre_args -d ${python.bin} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pre_args -b ${python.prefix}/bin \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -d ${python.pkgd} \
</span> -e ${python.include} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -v ${prefix}/share/sip \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -p macx-g++ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --bindir=${prefix}/bin \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --destdir=${python.pkgd} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --incdir=${python.include} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --sipdir=${prefix}/share/${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -v ${python.prefix}/share/sip \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -p macx-g++
</span>
# always add some arch flags, since the user might have overridden
# the default arch build (e.g., ticket #44086).
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> python.add_archflags no
if {[variant_isset universal]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -129,34 +120,47 @@ if {${name} ne ${subport}} {
</span>
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${xcodeversion} 4.3] < 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set sdk_dir ${developer_dir}/SDKs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # find a way to specify the OS MINOR version. For OSX 10.X, this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # value will be X. The type is this variable is integer, so we
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # can use "==" and so forth for comparison.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set MINOR ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # hopefully the MACOSX_DEPLOYMENT_TARGET exists and is set by now. if
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # not, last resort (which is not desirable) is to use the os.version.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${macosx_deployment_target} ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set MINOR [lindex [split ${macosx_deployment_target} "."] 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set MINOR [expr [lindex [split ${os.version} "."] 0] - 4]
</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;'>+ # set SDK version depending on OS version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set sdk_version ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${MINOR} == 4} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # OSX 10.4 requires an additional 'u'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set sdk_version "10.4u"
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set sdk_dir ${developer_dir}/Platforms/MacOSX.platform/Developer/SDKs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set sdk_version "10.${MINOR}"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- switch ${os.major} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8 { configure.args-append "--sdk=${sdk_dir}/MacOSX10.4u.sdk" }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 9 { configure.args-append "--sdk=${sdk_dir}/MacOSX10.5.sdk" }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 10 { configure.args-append "--sdk=${sdk_dir}/MacOSX10.6.sdk" }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 11 { configure.args-append "--sdk=${sdk_dir}/MacOSX10.7.sdk" }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 12 { configure.args-append "--sdk=${sdk_dir}/MacOSX10.8.sdk" }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 13 { configure.args-append "--sdk=${sdk_dir}/MacOSX10.9.sdk" }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${xcodeversion} 4.3] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set sdk_dir_top ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set sdk_dir_top Platforms/MacOSX.platform/Developer
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --sdk=${developer_dir}/${sdk_dir_top}/SDKs/MacOSX${sdk_version}.sdk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build.cmd make
build.target all
<span style='display:block; white-space:pre;background:#ffe0e0;'>- test.run yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test.cmd cd siplib && ${python.bin} -c 'import sip'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.cmd cd siplib && ${python.bin} -c 'import sip'
</span>
destroot.cmd make
destroot.destdir DESTDIR=${destroot}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Move ${prefix}/bin/sip to ${prefix}/bin/sip-${python.branch} for
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # all Python versions.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python.move_binaries yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-destroot {
xinstall -m 755 -d ${destroot}${prefix}/share/doc
file copy ${worksrcpath}/doc ${destroot}${prefix}/share/doc/${subport}
</pre><pre style='margin:0'>
</pre>