<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/a6e588c26cea2927e0ffe1188607541ddf62432d">https://github.com/macports/macports-ports/commit/a6e588c26cea2927e0ffe1188607541ddf62432d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a6e588c26cea2927e0ffe1188607541ddf62432d
</span>Author: Dean M Greer <38226388+Gcenx@users.noreply.github.com>
AuthorDate: Thu May 5 10:48:35 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> *-w64-mingw32-gcc: update to 11.3.0
</span>---
cross/i686-w64-mingw32-gcc/Portfile | 7 +-
.../files/patch-iains-i686-clang-bootstrap.diff | 131 ---------------------
cross/x86_64-w64-mingw32-gcc/Portfile | 4 +-
3 files changed, 4 insertions(+), 138 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 77df9ae9af7..e12fc024c29 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,10 +8,10 @@ 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} 11.2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+crossgcc.setup ${mingw_target} 11.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:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
maintainers {mojca @mojca} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,9 +30,6 @@ patchfiles-append patch-libgomp-Don-t-hard-code-MS-printf-attributes.diff
</span> # Fix ARM64, Patch taken from gcc-arm64-darwin port
patchfiles-append patch-arm64.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# fix no-pie clang bug bootstrapping gcc on i386
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-iains-i686-clang-bootstrap.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args-replace \
--enable-multilib \
--disable-multilib
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/cross/i686-w64-mingw32-gcc/files/patch-iains-i686-clang-bootstrap.diff b/cross/i686-w64-mingw32-gcc/files/patch-iains-i686-clang-bootstrap.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d4438cd5617..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/cross/i686-w64-mingw32-gcc/files/patch-iains-i686-clang-bootstrap.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,131 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git Makefile.in Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 5610c3355e8..165247d5df2 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -650,6 +650,20 @@ all:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @host_makefile_frag@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ###
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Allow host makefile fragment to override PIE settings.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ifneq ($(STAGE1_NO_PIE_CFLAGS),)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ HOST_EXPORTS += export NO_PIE_CFLAGS="$(STAGE1_NO_PIE_CFLAGS)";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ifneq ($(STAGE1_NO_PIE_FLAG),)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ HOST_EXPORTS += export NO_PIE_FLAG="$(STAGE1_NO_PIE_FLAG)";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ifneq ($(BOOT_NO_PIE_CFLAGS),)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ POSTSTAGE1_HOST_EXPORTS += export NO_PIE_CFLAGS="$(BOOT_NO_PIE_CFLAGS)";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ifneq ($(BOOT_NO_PIE_FLAG),)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ POSTSTAGE1_HOST_EXPORTS += export NO_PIE_FLAG="$(BOOT_NO_PIE_FLAG)";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This is the list of directories that may be needed in RPATH_ENVVAR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # so that programs built for the target machine work.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TARGET_LIB_PATH = $(TARGET_LIB_PATH_libstdc++-v3)$(TARGET_LIB_PATH_libsanitizer)$(TARGET_LIB_PATH_libvtv)$(TARGET_LIB_PATH_liboffloadmic)$(TARGET_LIB_PATH_libssp)$(TARGET_LIB_PATH_libphobos)$(TARGET_LIB_PATH_libgomp)$(TARGET_LIB_PATH_libitm)$(TARGET_LIB_PATH_libatomic)$(HOST_LIB_PATH_gcc)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git config/mh-darwin config/mh-darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 148b73038c3..08ce540b55e 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- config/mh-darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config/mh-darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,29 +1,33 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The -mdynamic-no-pic ensures that the compiler executable is built without
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# position-independent-code -- the usual default on Darwin. This fix speeds
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# compiles by 3-5%. Don't add it if the compiler doesn't also support
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# -mno-dynamic-no-pic to undo it.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--DARWIN_MDYNAMIC_NO_PIC := \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--`case ${host} in i?86-*-darwin* | powerpc-*-darwin*) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(CC) -S -xc /dev/null -o /dev/null -mno-dynamic-no-pic 2>/dev/null \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- && echo -mdynamic-no-pic ;; esac`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--DARWIN_GCC_MDYNAMIC_NO_PIC := \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--`case ${host} in i?86-*-darwin* | powerpc-*-darwin*) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(CC) -S -xc /dev/null -o /dev/null -mno-dynamic-no-pic 2>/dev/null \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- || echo -mdynamic-no-pic ;; esac`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# position-independent-code -- the usual default on Darwin. This speeds compiles
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# by 8-20% (measurements made against GCC-11). Do not add it if the buulding
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# compiler doesn't also support -mno-dynamic-no-pic to undo it, since libiberty,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# at least, needs this facility
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# ld on Darwin versions >= 10.7 defaults to PIE executables. Disable this for
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# gcc components, since it is incompatible with our pch implementation.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--DARWIN_NO_PIE := `case ${host} in *-*-darwin[1][1-9]*) echo -Wl,-no_pie ;; esac;`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# In addition, all versions of clang released to date treat -fno-PIE in -m32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# compilations as switching PIC code off too, which means that -fno-PIE, without
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# -mdynamic-no-pic produces broken relocations (and we cannot enable mdynamic-no-pic
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# because the inverse setting doesn't work).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--BOOT_CFLAGS += $(DARWIN_MDYNAMIC_NO_PIC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--BOOT_LDFLAGS += $(DARWIN_NO_PIE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CAN_MDYNAMIC_NO_PIC := \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+`$(CC) -S -xc /dev/null -o /dev/null -mno-dynamic-no-pic 2>/dev/null \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ && ($(CC) -E -dM -xc /dev/null | grep -q __clang__ || echo true)`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# Similarly, for cross-compilation.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--STAGE1_CFLAGS += $(DARWIN_MDYNAMIC_NO_PIC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--STAGE1_LDFLAGS += $(DARWIN_NO_PIE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Here we use STAGE1 to mean both bootstrap and for the no-bootstrap single compile.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ifeq ($(CAN_MDYNAMIC_NO_PIC),true)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+STAGE1_NO_PIE_CFLAGS = -fno-PIE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+STAGE1_NO_PIE_CFLAGS = -fno-PIE -fPIC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# Without -mno-dynamic-no-pic support, add -mdynamic-no-pic just to later
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# stages when we know it is built with gcc.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--STAGE2_CFLAGS += $(DARWIN_GCC_MDYNAMIC_NO_PIC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--STAGE3_CFLAGS += $(DARWIN_GCC_MDYNAMIC_NO_PIC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--STAGE4_CFLAGS += $(DARWIN_GCC_MDYNAMIC_NO_PIC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@if gcc-bootstrap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Add -mdynamic-no-pic to later stages when we know it is built with GCC.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+STAGE2_CFLAGS += -mdynamic-no-pic
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+STAGE3_CFLAGS += -mdynamic-no-pic
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+STAGE4_CFLAGS += -mdynamic-no-pic
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# For GCC, this is compatible with mdynamic-no-pic.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+BOOT_NO_PIE_CFLAGS = -fno-PIE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@endif gcc-bootstrap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+STAGE1_NO_PIE_FLAG = -Wl,-no_pie
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+BOOT_NO_PIE_FLAG = -Wl,-no_pie
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git gcc/configure gcc/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index cb89dd71b77..bd6b78213d0 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gcc/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gcc/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31100,7 +31100,7 @@ fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_c_no_fpie" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo "$gcc_cv_c_no_fpie" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$gcc_cv_c_no_fpie" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NO_PIE_CFLAGS="-fno-PIE"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NO_PIE_CFLAGS=${NO_PIE_CFLAGS-"-fno-PIE"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31128,7 +31128,7 @@ fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_no_pie" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo "$gcc_cv_no_pie" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$gcc_cv_no_pie" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NO_PIE_FLAG="-no-pie"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NO_PIE_FLAG=${NO_PIE_FLAG-"-no-pie"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git gcc/configure.ac gcc/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d8aad32f59f..1ccd9239072 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gcc/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gcc/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7002,7 +7002,7 @@ AC_CACHE_CHECK([for -fno-PIE option],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [gcc_cv_c_no_fpie=no])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS="$saved_CXXFLAGS"])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$gcc_cv_c_no_fpie" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NO_PIE_CFLAGS="-fno-PIE"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NO_PIE_CFLAGS=${NO_PIE_CFLAGS-"-fno-PIE"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_SUBST([NO_PIE_CFLAGS])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7016,7 +7016,7 @@ AC_CACHE_CHECK([for -no-pie option],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [gcc_cv_no_pie=no])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="$saved_LDFLAGS"])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$gcc_cv_no_pie" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NO_PIE_FLAG="-no-pie"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NO_PIE_FLAG=${NO_PIE_FLAG-"-no-pie"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_SUBST([NO_PIE_FLAG])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><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 9e5e578911c..54deb5ad681 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,10 +8,10 @@ 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} 11.2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+crossgcc.setup ${mingw_target} 11.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:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
maintainers {mojca @mojca} openmaintainer
</pre><pre style='margin:0'>
</pre>