<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/f12ea84357f0d1941b8228b71194d477ed78a645">https://github.com/macports/macports-ports/commit/f12ea84357f0d1941b8228b71194d477ed78a645</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 f12ea84  cmake: deselect variants while bootstrapping
</span>f12ea84 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit f12ea84357f0d1941b8228b71194d477ed78a645
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Sep 3 23:00:53 2019 +1000

<span style='display:block; white-space:pre;color:#404040;'>    cmake: deselect variants while bootstrapping
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    On 10.6/libc++, all cmake's variants add dependencies that will depend
</span><span style='display:block; white-space:pre;color:#404040;'>    on the default compiler, which will be some recent macports-clang,
</span><span style='display:block; white-space:pre;color:#404040;'>    which will depend on cmake. So if the compiler isn't already installed,
</span><span style='display:block; white-space:pre;color:#404040;'>    turn off all variants and tell the user that we did.
</span>---
 devel/cmake/Portfile | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

<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 f30d529..b926cf0 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;'>@@ -123,6 +123,13 @@ configure.env-append \
</span>                     CMAKE_INCLUDE_PATH=${prefix}/include/ncurses \
                     CMAKE_LIBRARY_PATH=${prefix}/lib
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Check if the default compiler has yet to be installed. Used to prevent
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# circular deps involving variants. Has to be tested here before our
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# blacklisting and whitelisting is applied.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} <= 10 && ${cxx_stdib} eq "libc++" && ![file exists ${configure.cxx}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set cmake_bootstrapping yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # On Lion, Clang 3.3 produces bad stream reading code when using libc++.
 # See https://trac.macports.org/ticket/44129
 # Clang 3.4 works. But Clang 3.7 doesn't work.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -221,6 +228,24 @@ post-destroot {
</span>     }
 }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# All the variants create circular dependencies on 10.6 with libc++,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# due to the default compiler needing cmake to build.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[info exists cmake_bootstrapping]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set some_variant_disabled 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    foreach vname {gui qt4 qt5 docs python34 python35 python36 python37} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {[variant_isset $vname]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            unset ::variations($vname)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            set some_variant_disabled 1
</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;'>+    if {$some_variant_disabled} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        notes-append "Installing $name with variants would create\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            circular dependencies, so all variants have been\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            deselected. You can install again with your desired\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            variants after the default compiler has been installed."
</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;'>+
</span> variant gui description {Build Qt-based cmake-gui} {
     configure.args-append --qt-gui
 }
</pre><pre style='margin:0'>

</pre>