<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/87ad2e503c6c8ea81d4fbb4f3f1078b669967118">https://github.com/macports/macports-ports/commit/87ad2e503c6c8ea81d4fbb4f3f1078b669967118</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 87ad2e503c6 {lib}gcc10: update to 10.3.0
</span>87ad2e503c6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 87ad2e503c6c8ea81d4fbb4f3f1078b669967118
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Thu Apr 8 16:13:05 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> {lib}gcc10: update to 10.3.0
</span>---
lang/gcc10/Portfile | 24 +++------
lang/gcc10/files/big-sur-version-fix.diff | 75 ---------------------------
lang/gcc10/files/fix-sanitisers-darwin20.diff | 12 -----
3 files changed, 6 insertions(+), 105 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc10/Portfile b/lang/gcc10/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1944b2c785b..ffa1726067e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc10/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc10/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,9 +8,9 @@ PortGroup conflicts_build 1.0
</span>
epoch 5
name gcc10
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 10.2.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-subport libgcc10 { revision 3 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 10.3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport libgcc10 { revision 0 }
</span> platforms darwin
categories lang
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,24 +43,12 @@ master_sites-append https://mirror.koddos.net/gcc/snapshots/${version}/ \
</span> distname gcc-${version}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 73f182e7d40e5c2988b2b8cd80cfca601f20e9fc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 75004144
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 8edb715cf1159fd8de773d0d5208d2e83ca36402 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 64f404c1a650f27fc33da242e1f2df54952e3963a49e06e73f6940f3223ac344 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 76692288
</span>
patchfiles patch-fix-libgccjit-soname
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} > 19 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/60908
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Patch for macOS 11 (Darwin20) version numbering taken from
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://github.com/iains/gcc-darwin-arm64/commit/556ab512
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append big-sur-version-fix.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Build doesn't understand a 11.0 deployment target so force to 10.16
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macosx_deployment_target 10.16
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Fix detection of sanitizer support
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/61494
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append fix-sanitisers-darwin20.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib port:cctools \
port:gmp \
path:lib/pkgconfig/isl.pc:isl \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc10/files/big-sur-version-fix.diff b/lang/gcc10/files/big-sur-version-fix.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0de7fc281dd..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc10/files/big-sur-version-fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,75 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -pur gcc-10.2.0-old/gcc/config/darwin-c.c gcc-10.2.0/gcc/config/darwin-c.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gcc/config/darwin-c.c.orig 2020-07-23 08:35:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gcc/config/darwin-c.c 2020-11-14 22:40:53.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -692,10 +692,10 @@ macosx_version_as_macro (void)
</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)
</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;'>- 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[MINOR] < 10)
</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;'>- version_macro = version_as_legacy_macro (version_array);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version_macro = version_as_modern_macro (version_array);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -pur gcc-10.2.0-old/gcc/config/darwin-driver.c gcc-10.2.0/gcc/config/darwin-driver.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gcc/config/darwin-driver.c.orig 2020-07-23 08:35:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gcc/config/darwin-driver.c 2020-11-14 22:40:53.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -65,7 +65,7 @@ validate_macosx_version_min (const char
</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;'>- 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 != 10) /* So far .. all MacOS 10 ... */
</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;'>- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Version string components must be present and numeric. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -104,7 +104,7 @@ validate_macosx_version_min (const char
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (need_rewrite)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *new_version;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- asprintf (&new_version, "10.%lu.%lu", minor, tiny);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ asprintf (&new_version, "%2lu.%lu.%lu", major, minor, tiny);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return new_version;
</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;'>-@@ -115,6 +115,12 @@ validate_macosx_version_min (const char
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/sysctl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "xregex.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* Determine the version of the running OS.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ We only look at the first two components (ignoring the patch one) and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ report NN.MM.0 where NN is currently either 10 or 11 and MM is the OS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ minor release number.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ If we can't parse what the kernel gives us, warn the user, and do nothing. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static char *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- darwin_find_version_from_kernel (void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -125,8 +131,6 @@ darwin_find_version_from_kernel (void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char * version_p;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char * new_flag;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* Determine the version of the running OS. If we can't, warn user,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- and do nothing. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (sysctl (osversion_name, ARRAY_SIZE (osversion_name), osversion,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- &osversion_len, NULL, 0) == -1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -144,10 +148,11 @@ darwin_find_version_from_kernel (void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- major_vers = major_vers * 10 + (*version_p++ - '0');
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (*version_p++ != '.')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- goto parse_failed;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* The major kernel version number is 4 plus the second OS version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- component. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (major_vers - 4 <= 4)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Darwin20 sees a transition to macOS 11. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (major_vers >= 20)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ asprintf (&new_flag, "11.%02d.00", major_vers - 20);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else if (major_vers - 4 <= 4)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* On 10.4 and earlier, the old linker is used which does not
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- support three-component system versions.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FIXME: we should not assume this - a newer linker could be used. */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc10/files/fix-sanitisers-darwin20.diff b/lang/gcc10/files/fix-sanitisers-darwin20.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 362eb305415..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc10/files/fix-sanitisers-darwin20.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libsanitizer/configure.tgt.orig 2020-11-18 18:57:16.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libsanitizer/configure.tgt 2020-11-18 18:57:16.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -63,6 +63,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- x86_64-*-darwin1[2-9]* | i?86-*-darwin1[2-9]*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TSAN_SUPPORTED=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ x86_64-*-darwin2[0-9]* | i?86-*-darwin2[0-9]*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ TSAN_SUPPORTED=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- x86_64-*-solaris2.11* | i?86-*-solaris2.11*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- riscv64-*-linux*)
</span></pre><pre style='margin:0'>
</pre>