<pre style='margin:0'>
Mojca Miklavec (mojca) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1f43f83ce6346fb0c9163a8ecf8125faaa18aab6">https://github.com/macports/macports-ports/commit/1f43f83ce6346fb0c9163a8ecf8125faaa18aab6</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1f43f83ce6346fb0c9163a8ecf8125faaa18aab6
</span>Author: Mojca Miklavec <mojca@macports.org>
AuthorDate: Mon Feb 12 22:08:22 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> mingw-w64: update to gcc 7.3.0, secure api support
</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/55499
</span>---
cross/i686-w64-mingw32-gcc/Portfile | 5 +----
cross/mingw-w64/Portfile | 3 ++-
cross/x86_64-w64-mingw32-gcc/Portfile | 5 +----
3 files changed, 4 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/cross/i686-w64-mingw32-gcc/Portfile b/cross/i686-w64-mingw32-gcc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c14c167..2c118f7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/cross/i686-w64-mingw32-gcc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/cross/i686-w64-mingw32-gcc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ set mingw_name w64-mingw32
</span> set mingw_arch i686
set mingw_target ${mingw_arch}-${mingw_name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-crossgcc.setup ${mingw_target} 7.2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+crossgcc.setup ${mingw_target} 7.3.0
</span> crossgcc.languages {c c++ fortran objc obj-c++}
dist_subdir gcc[lindex [split ${version} .] 0]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +33,6 @@ configure.args-append \
</span> --enable-fully-dynamic-string \
--enable-libssp \
--enable-lto \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-secure-api \
</span> --disable-libcc1
# without --disable-libcc1 the following files conflict:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,8 +66,6 @@ subport ${mingw_target}-gcc-nothreads {
</span>
# Final phase
if {${subport} eq ${name}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib-append port:${mingw_target}-crt \
port:${mingw_target}-winpthreads
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/cross/mingw-w64/Portfile b/cross/mingw-w64/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6b997ab..ef4a55e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/cross/mingw-w64/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/cross/mingw-w64/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,8 +55,9 @@ if {${subport} ne ${name}} {
</span>
# *-headers subports
if {${mingw_comp} eq "headers"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span> supported_archs noarch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-secure-api
</span>
# winpthreads install three files which conflict with placeholders provided by "headers"
#
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/cross/x86_64-w64-mingw32-gcc/Portfile b/cross/x86_64-w64-mingw32-gcc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 42a50de..5bf7106 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/cross/x86_64-w64-mingw32-gcc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/cross/x86_64-w64-mingw32-gcc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ set mingw_name w64-mingw32
</span> set mingw_arch x86_64
set mingw_target ${mingw_arch}-${mingw_name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-crossgcc.setup ${mingw_target} 7.2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+crossgcc.setup ${mingw_target} 7.3.0
</span> crossgcc.languages {c c++ fortran objc obj-c++}
dist_subdir gcc[lindex [split ${version} .] 0]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +33,6 @@ configure.args-append \
</span> --enable-fully-dynamic-string \
--enable-libssp \
--enable-lto \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-secure-api \
</span> --disable-libcc1
# without --disable-libcc1 the following files conflict:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,8 +66,6 @@ subport ${mingw_target}-gcc-nothreads {
</span>
# Final phase
if {${subport} eq ${name}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib-append port:${mingw_target}-crt \
port:${mingw_target}-winpthreads
</pre><pre style='margin:0'>
</pre>