<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/3c61ef18a45f028c61d628fa6e834a2e9bd64a0e">https://github.com/macports/macports-ports/commit/3c61ef18a45f028c61d628fa6e834a2e9bd64a0e</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 3c61ef18a45 *-w64-mingw32-gcc: fix patch files
</span>3c61ef18a45 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3c61ef18a45f028c61d628fa6e834a2e9bd64a0e
</span>Author: Mojca Miklavec <mojca@macports.org>
AuthorDate: Mon Jun 21 23:38:03 2021 +0200
<span style='display:block; white-space:pre;color:#404040;'> *-w64-mingw32-gcc: fix patch files
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This fixes the build on case sensitive filesystems.
</span><span style='display:block; white-space:pre;color:#404040;'> It also fixes a harmless line number mismatch in the patch files.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://github.com/macports/macports-ports/pull/11179
</span>---
cross/i686-w64-mingw32-gcc/Portfile | 2 +-
.../files/patch-libgomp-Don-t-hard-code-MS-printf-attributes.diff | 4 ++--
.../i686-w64-mingw32-gcc/files/patch-notparallel-install-headers.diff | 2 +-
cross/x86_64-w64-mingw32-gcc/Portfile | 2 +-
.../files/patch-libgomp-Don-t-hard-code-MS-printf-attributes.diff | 4 ++--
.../files/patch-notparallel-install-headers.diff | 2 +-
6 files changed, 8 insertions(+), 8 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 843330b26ff..7c16abf3270 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;'>@@ -28,7 +28,7 @@ patchfiles-append patch-notparallel-install-headers.diff
</span> patchfiles-append patch-libgomp-Don-t-hard-code-MS-printf-attributes.diff
# Fix ARM64, Patch taken from gcc-arm64-darwin port
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-ARM64.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-arm64.diff
</span>
configure.args-replace \
--enable-multilib \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/cross/i686-w64-mingw32-gcc/files/patch-libgomp-Don-t-hard-code-MS-printf-attributes.diff b/cross/i686-w64-mingw32-gcc/files/patch-libgomp-Don-t-hard-code-MS-printf-attributes.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 574abf202a9..94f9555e531 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/cross/i686-w64-mingw32-gcc/files/patch-libgomp-Don-t-hard-code-MS-printf-attributes.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/cross/i686-w64-mingw32-gcc/files/patch-libgomp-Don-t-hard-code-MS-printf-attributes.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +25,7 @@ index c98c1452bd4..0cc8443f6c2 100644
</span> #ifdef HAVE_ATTRIBUTE_VISIBILITY
# pragma GCC visibility push(hidden)
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -180,7 +187,7 @@ extern void gomp_aligned_free (void *);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -173,7 +180,7 @@ extern void gomp_aligned_free (void *);
</span>
extern void gomp_vdebug (int, const char *, va_list);
extern void gomp_debug (int, const char *, ...)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +34,7 @@ index c98c1452bd4..0cc8443f6c2 100644
</span> #define gomp_vdebug(KIND, FMT, VALIST) \
do { \
if (__builtin_expect (gomp_debug_var, 0)) \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -193,11 +200,11 @@ extern void gomp_debug (int, const char *, ...)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -186,11 +193,11 @@ extern void gomp_debug (int, const char *, ...)
</span> } while (0)
extern void gomp_verror (const char *, va_list);
extern void gomp_error (const char *, ...)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/cross/i686-w64-mingw32-gcc/files/patch-notparallel-install-headers.diff b/cross/i686-w64-mingw32-gcc/files/patch-notparallel-install-headers.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 31e574082d1..f5328e7b1bd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/cross/i686-w64-mingw32-gcc/files/patch-notparallel-install-headers.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/cross/i686-w64-mingw32-gcc/files/patch-notparallel-install-headers.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ https://trac.macports.org/ticket/55213
</span>
--- libstdc++-v3/include/Makefile.in.orig
+++ libstdc++-v3/include/Makefile.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1875,6 +1875,8 @@ ${pch3_output}: ${pch3_source} ${pch2_output}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1888,6 +1888,8 @@ ${pch3_output}: ${pch3_source} ${pch2_output}
</span> @GLIBCXX_HOSTED_TRUE@install-data-local: install-headers
@GLIBCXX_HOSTED_FALSE@install-data-local: install-freestanding-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 97222a91625..ece6c682cae 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;'>@@ -28,7 +28,7 @@ patchfiles-append patch-notparallel-install-headers.diff
</span> patchfiles-append patch-libgomp-Don-t-hard-code-MS-printf-attributes.diff
# Fix ARM64, Patch taken from gcc-arm64-darwin port
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-ARM64.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-arm64.diff
</span>
configure.args-replace \
--enable-multilib \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/cross/x86_64-w64-mingw32-gcc/files/patch-libgomp-Don-t-hard-code-MS-printf-attributes.diff b/cross/x86_64-w64-mingw32-gcc/files/patch-libgomp-Don-t-hard-code-MS-printf-attributes.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 574abf202a9..94f9555e531 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/cross/x86_64-w64-mingw32-gcc/files/patch-libgomp-Don-t-hard-code-MS-printf-attributes.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/cross/x86_64-w64-mingw32-gcc/files/patch-libgomp-Don-t-hard-code-MS-printf-attributes.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +25,7 @@ index c98c1452bd4..0cc8443f6c2 100644
</span> #ifdef HAVE_ATTRIBUTE_VISIBILITY
# pragma GCC visibility push(hidden)
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -180,7 +187,7 @@ extern void gomp_aligned_free (void *);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -173,7 +180,7 @@ extern void gomp_aligned_free (void *);
</span>
extern void gomp_vdebug (int, const char *, va_list);
extern void gomp_debug (int, const char *, ...)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +34,7 @@ index c98c1452bd4..0cc8443f6c2 100644
</span> #define gomp_vdebug(KIND, FMT, VALIST) \
do { \
if (__builtin_expect (gomp_debug_var, 0)) \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -193,11 +200,11 @@ extern void gomp_debug (int, const char *, ...)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -186,11 +193,11 @@ extern void gomp_debug (int, const char *, ...)
</span> } while (0)
extern void gomp_verror (const char *, va_list);
extern void gomp_error (const char *, ...)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/cross/x86_64-w64-mingw32-gcc/files/patch-notparallel-install-headers.diff b/cross/x86_64-w64-mingw32-gcc/files/patch-notparallel-install-headers.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 31e574082d1..f5328e7b1bd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/cross/x86_64-w64-mingw32-gcc/files/patch-notparallel-install-headers.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/cross/x86_64-w64-mingw32-gcc/files/patch-notparallel-install-headers.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ https://trac.macports.org/ticket/55213
</span>
--- libstdc++-v3/include/Makefile.in.orig
+++ libstdc++-v3/include/Makefile.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1875,6 +1875,8 @@ ${pch3_output}: ${pch3_source} ${pch2_output}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1888,6 +1888,8 @@ ${pch3_output}: ${pch3_source} ${pch2_output}
</span> @GLIBCXX_HOSTED_TRUE@install-data-local: install-headers
@GLIBCXX_HOSTED_FALSE@install-data-local: install-freestanding-headers
</pre><pre style='margin:0'>
</pre>