<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/2b0a7aecfd280285dcd0f92254771d8bd03a2d85">https://github.com/macports/macports-ports/commit/2b0a7aecfd280285dcd0f92254771d8bd03a2d85</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 2b0a7ae cmake: remove support for Py34 and add it for Py38
</span>2b0a7ae is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2b0a7aecfd280285dcd0f92254771d8bd03a2d85
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Sat Nov 30 19:57:49 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> cmake: remove support for Py34 and add it for Py38
</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/59775
</span>---
devel/cmake/Portfile | 42 +++++++++++++++++++-----------------------
1 file changed, 19 insertions(+), 23 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/Portfile b/devel/cmake/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bb571f9..94f15a6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -232,7 +232,7 @@ post-destroot {
</span> # due to the default compiler needing cmake to build.
if {[info exists cmake_bootstrapping]} {
set some_variant_disabled 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach vname {gui qt4 qt5 docs python34 python35 python36 python37} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach vname {gui qt4 qt5 docs python35 python36 python37 python38} {
</span> if {[variant_isset $vname]} {
unset ::variations($vname)
set some_variant_disabled 1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -304,50 +304,46 @@ variant docs description {Build documentation: HTML and manpages} {
</span> port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-websupport
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# cmake 3.15 requires Python3X for +docs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# variant python27 conflicts python34 python35 python36 requires docs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# description {Build documentation using Sphinx from Python 2.7} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python34 conflicts python35 python36 python37 requires docs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description {Build documentation using Sphinx from Python 3.4} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python35 conflicts python34 python36 python37 requires docs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python35 conflicts python36 python37 python38 requires docs \
</span> description {Build documentation using Sphinx from Python 3.5} {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python36 conflicts python34 python35 python37 requires docs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python36 conflicts python35 python37 python38 requires docs \
</span> description {Build documentation using Sphinx from Python 3.6} {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python37 conflicts python34 python35 python36 requires docs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python37 conflicts python35 python36 python38 requires docs \
</span> description {Build documentation using Sphinx from Python 3.7} {}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python38 conflicts python35 python36 python37 requires docs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description {Build documentation using Sphinx from Python 3.8} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {[variant_isset docs]} {
# default Python is 3.6
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset python34] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset python35] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset python35] &&
</span> ![variant_isset python36] &&
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset python37]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +python36
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python37] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python38]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +python37
</span> }
# make sure -python36 is not specified alone
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset python34] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset python35] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset python35] &&
</span> ![variant_isset python36] &&
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset python37]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "\n\nYou must select either the +python34, +python35, +python36, or +python37 variant when using variant +docs.\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python37] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python38]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "\n\nYou must select either the +python35, +python36, +python37, or +python38 variant when using variant +docs.\n"
</span> return -code error "Invalid variant selection"
}
# determine Python-related variables
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset python34]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set PYTHON_VERSION_WITH_DOT "3.4"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {[variant_isset python35]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset python35]} {
</span> set PYTHON_VERSION_WITH_DOT "3.5"
} elseif {[variant_isset python36]} {
set PYTHON_VERSION_WITH_DOT "3.6"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[variant_isset python37]} {
</span> set PYTHON_VERSION_WITH_DOT "3.7"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set PYTHON_VERSION_WITH_DOT "3.8"
</span> }
set PYTHON_VERSION_NO_DOT [join [split ${PYTHON_VERSION_WITH_DOT} "."] ""]
</pre><pre style='margin:0'>
</pre>