<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/d9e3218c0d5cee4b33860b5fbdc6164138997d3f">https://github.com/macports/macports-ports/commit/d9e3218c0d5cee4b33860b5fbdc6164138997d3f</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 d9e3218c0d5 cmake{,-devel}: fix build before 10.10
</span>d9e3218c0d5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d9e3218c0d5cee4b33860b5fbdc6164138997d3f
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Sat Nov 26 01:09:10 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> cmake{,-devel}: fix build before 10.10
</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/66340
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/66040
</span>---
devel/cmake-devel/Portfile | 12 ++----------
devel/cmake/Portfile | 10 +---------
2 files changed, 3 insertions(+), 19 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake-devel/Portfile b/devel/cmake-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 177847a2f7a..f234c25270e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,6 +7,7 @@ if { ${os.platform} eq "darwin" && ${os.major} >= 20 && ${build_arch} eq "x86_64
</span> universal_variant no
} else {
PortGroup muniversal 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
PortGroup xcodeversion 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +50,7 @@ epoch 1
</span> dist_subdir ${my_name}
compiler.cxx_standard \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2014
</span>
platform darwin {
if {!((${os.major} < 9) || ${build_arch} eq "ppc" || ${build_arch} eq "ppc64")} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -102,15 +103,6 @@ configure.env-append \
</span> CMAKE_INCLUDE_PATH=${prefix}/include/ncurses \
CMAKE_LIBRARY_PATH=${prefix}/lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# On Lion, Clang 3.3 produces bad stream reading code when using
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# libc++. See https://trac.macports.org/ticket/44129 . Clang 3.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# works. But Clang 3.7 doesn't work.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} == 11 &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${configure.cxx_stdlib} eq "libc++"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.whitelist \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macports-clang-3.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # clang 3.4 can't build certain parts of the
# cmake self-testing infrastructure
# https://trac.macports.org/ticket/59782
<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 7bf2c9317bf..e7b5bbae129 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;'>@@ -41,7 +41,7 @@ checksums rmd160 09373f97fee569133852498f0de6e9f6db10084b \
</span> revision 0
gitlab.livecheck.regex {([0-9.]+)}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2014
</span>
platform darwin {
if {!((${os.major} < 9) || ${build_arch} eq "ppc" ||
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -102,14 +102,6 @@ if {${os.platform} eq "darwin" && ${os.major} <= 10 &&
</span> set cmake_bootstrapping yes
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# On Lion, Clang 3.3 produces bad stream reading code when using
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# libc++. See https://trac.macports.org/ticket/44129 . Clang 3.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# works. But Clang 3.7 doesn't work.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} == 11 &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${configure.cxx_stdlib} eq "libc++"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.whitelist macports-clang-3.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # clang 3.4 can't build certain parts of the
# cmake self-testing infrastructure
# https://trac.macports.org/ticket/59782
</pre><pre style='margin:0'>
</pre>