<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/2253ff5052d8ca29fdba1c83c5358a73317317dc">https://github.com/macports/macports-ports/commit/2253ff5052d8ca29fdba1c83c5358a73317317dc</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 2253ff5052d cmake: fix +python* and +docs to work correctly
</span>2253ff5052d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2253ff5052d8ca29fdba1c83c5358a73317317dc
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Thu Nov 24 11:33:58 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> cmake: fix +python* and +docs to work correctly
</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/62402
</span>---
devel/cmake/Portfile | 14 ++++++--------
1 file changed, 6 insertions(+), 8 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 0439008060e..7bf2c9317bf 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;'>@@ -251,12 +251,13 @@ foreach pyver ${python_versions} {
</span>
set python_branch "[string index ${pyver} 0].[string range ${pyver} 1 end]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant python${pyver} conflicts {*}${other_python_versions} requires docs description "Build documentation using ${python_branch} sphinx" {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant python${pyver} conflicts {*}${other_python_versions} description "Build documentation using ${python_branch} sphinx" {}
</span> }
# +docs requires one +python* variant
if {[variant_isset docs]} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see if one or more +python* variants is set
</span> set python_isset false
foreach pyver ${python_versions} {
if {!${python_isset}} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -270,27 +271,24 @@ if {[variant_isset docs]} {
</span>
# set default +python* variant if none were already selected
if {!${python_isset}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set python_isset true
</span> default_variants +python39
}
# make sure one of the +python* variants is set
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # this loop checks for "+docs" and - default Python variant
</span> set python_isset false
foreach pyver ${python_versions} {
if {!${python_isset}} {
set python_isset [variant_isset python${pyver}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set python_branch "[string index ${pyver} 0].[string range ${pyver} 1 end]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set PYTHON_VERSION_WITH_DOT "[string index ${pyver} 0].[string range ${pyver} 1 end]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set PYTHON_VERSION_NO_DOT ${pyver}
</span> }
}
if {!${python_isset}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "\n\nYou must select either the +python35, +python36, +python37, +python38 or +python39 variant when using variant +docs.\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "\n\nYou must select exactly one of the +python35, +python36, +python37, +python38, +python39, +python310, or +python311 variants when using variant +docs.\n"
</span> return -code error "Invalid variant selection"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set PYTHON_VERSION_WITH_DOT ${python_branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set PYTHON_VERSION_NO_DOT ${pyver}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> }
variant docs description {Build documentation: HTML and manpages} {
</pre><pre style='margin:0'>
</pre>