<pre style='margin:0'>
Lawrence Velázquez (larryv) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bb414feaa4e56c2a28442d8b2ceb09c0eaa2b70e">https://github.com/macports/macports-ports/commit/bb414feaa4e56c2a28442d8b2ceb09c0eaa2b70e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit bb414feaa4e56c2a28442d8b2ceb09c0eaa2b70e
</span>Author: Lawrence Velázquez <larryv@macports.org>
AuthorDate: Tue Nov 29 19:14:56 2016 -0500
<span style='display:block; white-space:pre;color:#404040;'> cmake-1.*: Remove "--enable-debug" at last minute
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Do this in pre-configure to make sure the portfile can't sneak it in.
</span>---
_resources/port1.0/group/cmake-1.0.tcl | 9 +++------
_resources/port1.0/group/cmake-1.1.tcl | 9 +++------
2 files changed, 6 insertions(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/cmake-1.0.tcl b/_resources/port1.0/group/cmake-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 3028ce4..ecd6b77 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/cmake-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/cmake-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -121,6 +121,9 @@ pre-configure {
</span> configure.args-append -DCMAKE_C_FLAGS_RELEASE="-DNDEBUG" \
-DCMAKE_CXX_FLAGS_RELEASE="-DNDEBUG"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # CMake doesn't like --enable-debug, so remove it unconditionally.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --enable-debug
</span> }
platform darwin {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -183,12 +186,6 @@ variant debug description "Enable debug binaries" {
</span> configure.args-replace -DCMAKE_BUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Debug
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# cmake doesn't like --enable-debug, so in case a portfile sets
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# --enable-debug (regardless of variant) we remove it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[string first "--enable-debug" ${configure.args}] > -1} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --enable-debug
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> default build.dir {${configure.dir}}
default build.post_args {VERBOSE=ON}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/cmake-1.1.tcl b/_resources/port1.0/group/cmake-1.1.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 875045f..b2f455c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/cmake-1.1.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/cmake-1.1.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -174,6 +174,9 @@ pre-configure {
</span> if {${cmake.install_rpath} ne ""} {
configure.args-append -DCMAKE_INSTALL_RPATH="[join ${cmake.install_rpath} \;]"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # CMake doesn't like --enable-debug, so remove it unconditionally.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --enable-debug
</span> }
post-configure {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -279,12 +282,6 @@ variant debug description "Enable debug binaries" {
</span> -DCMAKE_BUILD_TYPE=Debug
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# cmake doesn't like --enable-debug, so in case a portfile sets
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# --enable-debug (regardless of variant) we remove it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[string first "--enable-debug" ${configure.args}] > -1} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --enable-debug
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> default build.dir {${configure.dir}}
default build.post_args {VERBOSE=ON}
</pre><pre style='margin:0'>
</pre>