<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/b1ebb517cb792b320759b70dc25f67bcbf1f8607">https://github.com/macports/macports-ports/commit/b1ebb517cb792b320759b70dc25f67bcbf1f8607</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 b1ebb517cb7 gcc-devel: add basic support for macOS 12 Monterey
</span>b1ebb517cb7 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b1ebb517cb792b320759b70dc25f67bcbf1f8607
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Mon Aug 2 12:09:31 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> gcc-devel: add basic support for macOS 12 Monterey
</span>---
lang/gcc-devel/Portfile | 6 +++
.../patch-min-fixes-for-macOS-12-Monterey.x86.diff | 56 ++++++++++++++++++++++
2 files changed, 62 insertions(+)
<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 e993107e7aa..bc628aef5db 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,6 +74,12 @@ if { ${build_arch} eq "arm64" } {
</span> distname gcc-${version}
use_xz yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporary patch to allow build on macOS 12 Monterey; this patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # is the minimum required for basic functionality; it does not
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # provide for optimizations for the specific OS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-min-fixes-for-macOS-12-Monterey.x86.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..54671ac87b8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc-devel/files/patch-min-fixes-for-macOS-12-Monterey.x86.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,56 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gcc/config.gcc b/gcc/config.gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 93e2b3219..ad3d1c30a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/gcc/config.gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/gcc/config.gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -674,6 +674,11 @@ case ${target} in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macos_maj=11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def_ld64=609.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *-*-darwin21*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Darwin 21 corresponds to macOS 12.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ macos_maj=12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ def_ld64=650.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *-*-darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case ${cpu_type} in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ aarch64) macos_maj=11 ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gcc/config/darwin-c.c b/gcc/config/darwin-c.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 951a99877..62d28fcea 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/gcc/config/darwin-c.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/gcc/config/darwin-c.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -691,7 +691,7 @@ macosx_version_as_macro (void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!version_array)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ goto fail;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (version_array[MAJOR] < 10 || version_array[MAJOR] > 11)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (version_array[MAJOR] < 10 || version_array[MAJOR] > 12)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ goto fail;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (version_array[MAJOR] == 10 && version_array[MINOR] < 10)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gcc/config/darwin-driver.c b/gcc/config/darwin-driver.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3d7768f05..39bae2ff3 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/gcc/config/darwin-driver.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/gcc/config/darwin-driver.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -64,13 +64,20 @@ validate_macosx_version_min (const char *version_str)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ major = strtoul (version_str, &end, 10);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (major < 10 || major > 11 ) /* MacOS 10 and 11 are known. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (major < 10 || major > 12 ) /* MacOS 10, 11, and 12 are known. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Skip a separating period, if there's one. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version_str = end + ((*end == '.') ? 1 : 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (major == 11 && *end != '\0' && !ISDIGIT (version_str[0]))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (major == 12 && *end != '\0' && !ISDIGIT (version_str[0]))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* For MacOS 12, we allow just the major number, but if the minor is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ there it must be numeric. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else if (major == 12 && *end == '\0')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* We will rewrite 12 => 12.0.0. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ need_rewrite = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else if (major == 11 && *end != '\0' && !ISDIGIT (version_str[0]))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* For MacOS 11, we allow just the major number, but if the minor is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ there it must be numeric. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return NULL;
</span></pre><pre style='margin:0'>
</pre>