<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/16a8f77942fbb97c27a435320a619f554ed489b8">https://github.com/macports/macports-ports/commit/16a8f77942fbb97c27a435320a619f554ed489b8</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 16a8f77 cmake: add patch to fix struct init that breaks builds on older OSs
</span>16a8f77 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 16a8f77942fbb97c27a435320a619f554ed489b8
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Mon Dec 16 09:54:16 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> cmake: add patch to fix struct init that breaks builds on older OSs
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix seems to be universal, not specific for any given OS or compiler.
</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/59822
</span>---
devel/cmake/Portfile | 5 +-
devel/cmake/files/patch-Tests_fix_struct_init.diff | 83 ++++++++++++++++++++++
2 files changed, 87 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 4c738f6..5b78df4 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;'>@@ -124,6 +124,10 @@ 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;'>+# temporary patch to fix struct init that breaks builds on older OSs;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# fix seems to be universal, not specific for any given OS or compiler.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-Tests_fix_struct_init.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # configure is just a shell script that passes directly to bootstrap
configure.cmd ./bootstrap
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -156,7 +160,6 @@ if {${configure.compiler} eq "macports-clang-3.4"} {
</span> configure.post_args-append -DBUILD_TESTING=OFF
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> platform darwin {
configure.env-append \
CMAKE_OSX_DEPLOYMENT_TARGET=${macosx_deployment_target}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-Tests_fix_struct_init.diff b/devel/cmake/files/patch-Tests_fix_struct_init.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..dfe6abb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-Tests_fix_struct_init.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,83 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Tests/CMakeLib/testCTestResourceSpec.cxx.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Tests/CMakeLib/testCTestResourceSpec.cxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,43 +21,43 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {"threads", {
</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;'>+- {"spec2.json", true, {{{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }}}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {"spec3.json", false, {{{}}}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {"spec4.json", false, {{{}}}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {"spec5.json", false, {{{}}}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {"spec6.json", false, {{{}}}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {"spec7.json", false, {{{}}}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {"spec8.json", false, {{{}}}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {"spec9.json", false, {{{}}}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {"spec10.json", false, {{{}}}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {"spec11.json", false, {{{}}}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {"spec12.json", false, {{{}}}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {"spec13.json", false, {{{}}}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {"spec14.json", true, {{{}}}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {"spec15.json", true, {{{}}}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {"spec16.json", true, {{{}}}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {"spec17.json", false, {{{}}}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {"spec18.json", false, {{{}}}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {"spec19.json", false, {{{}}}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {"spec20.json", true, {{{}}}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {"spec21.json", false, {{{}}}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {"spec22.json", false, {{{}}}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {"spec23.json", false, {{{}}}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {"spec24.json", false, {{{}}}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {"spec25.json", false, {{{}}}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {"spec26.json", false, {{{}}}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {"spec27.json", false, {{{}}}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {"spec28.json", false, {{{}}}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {"spec29.json", false, {{{}}}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {"spec30.json", false, {{{}}}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {"spec31.json", false, {{{}}}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {"spec32.json", false, {{{}}}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {"spec33.json", false, {{{}}}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {"spec34.json", false, {{{}}}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {"spec35.json", false, {{{}}}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {"spec36.json", false, {{{}}}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {"noexist.json", false, {{{}}}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"spec2.json", true, {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"spec3.json", false, {}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"spec4.json", false, {}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"spec5.json", false, {}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"spec6.json", false, {}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"spec7.json", false, {}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"spec8.json", false, {}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"spec9.json", false, {}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"spec10.json", false, {}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"spec11.json", false, {}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"spec12.json", false, {}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"spec13.json", false, {}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"spec14.json", true, {}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"spec15.json", true, {}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"spec16.json", true, {}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"spec17.json", false, {}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"spec18.json", false, {}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"spec19.json", false, {}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"spec20.json", true, {}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"spec21.json", false, {}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"spec22.json", false, {}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"spec23.json", false, {}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"spec24.json", false, {}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"spec25.json", false, {}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"spec26.json", false, {}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"spec27.json", false, {}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"spec28.json", false, {}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"spec29.json", false, {}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"spec30.json", false, {}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"spec31.json", false, {}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"spec32.json", false, {}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"spec33.json", false, {}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"spec34.json", false, {}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"spec35.json", false, {}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"spec36.json", false, {}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"noexist.json", false, {}},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* clang-format on */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>