<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/341479fb9ba771be9b9fba033dc70f7d1797eae4">https://github.com/macports/macports-ports/commit/341479fb9ba771be9b9fba033dc70f7d1797eae4</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 341479fb9ba gcc-devel: drop patch
</span>341479fb9ba is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 341479fb9ba771be9b9fba033dc70f7d1797eae4
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Wed Nov 3 21:59:16 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> gcc-devel: drop patch
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Superseded by upstream changes
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/63789
</span>---
lang/gcc-devel/Portfile | 6 ---
.../patch-min-fixes-for-macOS-12-Monterey.x86.diff | 56 ----------------------
2 files changed, 62 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc-devel/Portfile b/lang/gcc-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ed832d5a9bf..def1b7ec5b5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,12 +74,6 @@ if { ${build_arch} eq "arm64" } {
</span> distname gcc-${version}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # temporary patch to allow build on macOS 12 Monterey; this patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # is the minimum required for basic functionality; it does not
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # provide for optimizations for the specific OS.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-min-fixes-for-macOS-12-Monterey.x86.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> }
depends_build-append \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc-devel/files/patch-min-fixes-for-macOS-12-Monterey.x86.diff b/lang/gcc-devel/files/patch-min-fixes-for-macOS-12-Monterey.x86.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9a55462c1f7..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc-devel/files/patch-min-fixes-for-macOS-12-Monterey.x86.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,56 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/gcc/config.gcc b/gcc/config.gcc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 93e2b3219..ad3d1c30a 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/gcc/config.gcc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/gcc/config.gcc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -684,6 +684,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macos_maj=11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def_ld64=609.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *-*-darwin21*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # Darwin 21 corresponds to macOS 12.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ macos_maj=12
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ def_ld64=650.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *-*-darwin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case ${cpu_type} in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- aarch64) macos_maj=11 ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/gcc/config/darwin-c.c b/gcc/config/darwin-c.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 951a99877..62d28fcea 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/gcc/config/darwin-c.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/gcc/config/darwin-c.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -691,7 +691,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!version_array)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- goto fail;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (version_array[MAJOR] < 10 || version_array[MAJOR] > 11)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (version_array[MAJOR] < 10 || version_array[MAJOR] > 12)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- goto fail;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (version_array[MAJOR] == 10 && version_array[MINOR] < 10)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/gcc/config/darwin-driver.c b/gcc/config/darwin-driver.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 3d7768f05..39bae2ff3 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/gcc/config/darwin-driver.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/gcc/config/darwin-driver.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -64,13 +64,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- major = strtoul (version_str, &end, 10);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (major < 10 || major > 11 ) /* MacOS 10 and 11 are known. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (major < 10 || major > 12 ) /* MacOS 10, 11, and 12 are known. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Skip a separating period, if there's one. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version_str = end + ((*end == '.') ? 1 : 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (major == 11 && *end != '\0' && !ISDIGIT (version_str[0]))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (major == 12 && *end != '\0' && !ISDIGIT (version_str[0]))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* For MacOS 12, we allow just the major number, but if the minor is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ there it must be numeric. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else if (major == 12 && *end == '\0')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* We will rewrite 12 => 12.0.0. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ need_rewrite = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else if (major == 11 && *end != '\0' && !ISDIGIT (version_str[0]))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* For MacOS 11, we allow just the major number, but if the minor is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- there it must be numeric. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NULL;
</span></pre><pre style='margin:0'>
</pre>