<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/ac9b9592f4e0a909cf85797fe4f601cbade82f7d">https://github.com/macports/macports-ports/commit/ac9b9592f4e0a909cf85797fe4f601cbade82f7d</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 ac9b959 cmake: fix build with clang-3.4
</span>ac9b959 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ac9b9592f4e0a909cf85797fe4f601cbade82f7d
</span>Author: kencu <ken.cunningham.webuse@gmail.com>
AuthorDate: Thu Dec 5 22:07:55 2019 -0800
<span style='display:block; white-space:pre;color:#404040;'> cmake: fix build with clang-3.4
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> enable existing mechanism to pass -DCMAKE arg to cmake during build
</span><span style='display:block; white-space:pre;color:#404040;'> disable certain cmake self-tests which currently don't build with clang-3.4
</span><span style='display:block; white-space:pre;color:#404040;'> allows bootstrapping with clang-3.4 -> cmake -> clang-3.7
</span><span style='display:block; white-space:pre;color:#404040;'> closes: https://trac.macports.org/ticket/59782
</span>---
devel/cmake/Portfile | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
<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 14ca9da..20abff3 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;'>@@ -122,6 +122,13 @@ depends_lib-append port:curl \
</span> # system libuv is the default as of 20160830 (g320f5)
depends_lib-append path:lib/pkgconfig/libuv.pc:libuv
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure is just a shell script that passes directly to bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cmd ./bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# bootstrap takes cmake-style args for the build of the cmake to be installed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# the args are passed as usual for cmake, after "--", so we pass them as post_args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.post_args --
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.env-append \
CMAKE_PREFIX_PATH=${prefix} \
CMAKE_INCLUDE_PATH=${prefix}/include/ncurses \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -141,6 +148,13 @@ if {${os.platform} eq "darwin" && ${os.major} == 11 && ${configure.cxx_stdlib} e
</span> compiler.whitelist macports-clang-3.4
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# clang 3.4 can't build certain parts of the cmake self-testing infrastructure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/59782
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${configure.compiler} eq "macports-clang-3.4"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.post_args-append -DBUILD_TESTING=OFF
</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> platform darwin {
configure.env-append \
CMAKE_OSX_DEPLOYMENT_TARGET=${macosx_deployment_target}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -173,7 +187,6 @@ configure.args-append --docdir=share/doc/cmake \
</span> --no-system-librhash
configure.universal_args
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.post_args
</span>
# CMake's configure script doesn't recognize `--host`.
array set merger_host {i386 {} x86_64 {} ppc {} ppc64 {}}
</pre><pre style='margin:0'>
</pre>