<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/e35120b701a150f19c62afed12abc2967cb23939">https://github.com/macports/macports-ports/commit/e35120b701a150f19c62afed12abc2967cb23939</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 e35120b cmake-1.1: debug variant wait until pre-configure
</span>e35120b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e35120b701a150f19c62afed12abc2967cb23939
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Jan 16 10:35:52 2020 -0600
<span style='display:block; white-space:pre;color:#404040;'> cmake-1.1: debug variant wait until pre-configure
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The debug variant was inspecting the compiler before a port had a chance
</span><span style='display:block; white-space:pre;color:#404040;'> to override it, resulting in the clang-specific -fno-limit-debug-info
</span><span style='display:block; white-space:pre;color:#404040;'> flag being passed to non-clang compilers, resulting in failure.
</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/59973
</span>---
_resources/port1.0/group/cmake-1.1.tcl | 42 ++++++++++++++++++----------------
1 file changed, 22 insertions(+), 20 deletions(-)
<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 d04b1dd..a5bda75 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;'>@@ -451,25 +451,27 @@ platform darwin {
</span> configure.universal_args-delete --disable-dependency-tracking
variant debug description "Enable debug binaries" {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # this PortGroup uses a custom CMAKE_BUILD_TYPE giving complete control over
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # the compiler flags. We use that here: replace the default -O2 with -O0, add
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # debugging options and do otherwise an exactly identical build.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cflags-replace -O2 -O0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxxflags-replace -O2 -O0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.objcflags-replace -O2 -O0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.objcxxflags-replace -O2 -O0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-replace -O2 -O0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # get most if not all possible debug info
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[string match *clang* ${configure.cxx}] || [string match *clang* ${configure.cc}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cmake::debugopts "-g -fno-limit-debug-info -DDEBUG"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cmake::debugopts "-g -DDEBUG"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # this PortGroup uses a custom CMAKE_BUILD_TYPE giving complete control over
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the compiler flags. We use that here: replace the default -O2 with -O0, add
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # debugging options and do otherwise an exactly identical build.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cflags-replace -O2 -O0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-replace -O2 -O0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.objcflags-replace -O2 -O0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.objcxxflags-replace -O2 -O0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-replace -O2 -O0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # get most if not all possible debug info
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string match *clang* ${configure.cxx}] || [string match *clang* ${configure.cc}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cmake::debugopts "-g -fno-limit-debug-info -DDEBUG"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cmake::debugopts "-g -DDEBUG"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cflags-append ${cmake::debugopts}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append ${cmake::debugopts}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.objcflags-append ${cmake::debugopts}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.objcxxflags-append ${cmake::debugopts}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append ${cmake::debugopts}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # try to ensure that info won't get stripped
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DCMAKE_STRIP:FILEPATH=/bin/echo
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cflags-append ${cmake::debugopts}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxxflags-append ${cmake::debugopts}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.objcflags-append ${cmake::debugopts}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.objcxxflags-append ${cmake::debugopts}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-append ${cmake::debugopts}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # try to ensure that info won't get stripped
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DCMAKE_STRIP:FILEPATH=/bin/echo
</span> }
</pre><pre style='margin:0'>
</pre>