<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/89ecdc88e4e94fbc0d363746da24e98ef1eb3ecc">https://github.com/macports/macports-ports/commit/89ecdc88e4e94fbc0d363746da24e98ef1eb3ecc</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 89ecdc88e4e94fbc0d363746da24e98ef1eb3ecc
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Wed Nov 18 20:16:42 2020 +0000

<span style='display:block; white-space:pre;color:#404040;'>    (lib)gcc9: Restore sanitizers on Darwin20
</span>---
 lang/gcc9/Portfile                           |  5 ++++-
 lang/gcc9/files/fix-sanitisers-darwin20.diff | 12 ++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc9/Portfile b/lang/gcc9/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a9eeac42614..1a6cb97fe63 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc9/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc9/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,6 +47,9 @@ if { ${os.major} > 19 } {
</span>     patchfiles-append         big-sur-version-fix.diff
     # Build doesn't understand a 11.0 deployment target so force to 10.16
     macosx_deployment_target  10.16
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    # Fix detection of sanitizer support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # https://trac.macports.org/ticket/61494
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append         fix-sanitisers-darwin20.diff
</span> }
 
 depends_lib         port:cctools \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -240,7 +243,7 @@ if {${subport} eq "libgcc9"} {
</span>         # https://trac.macports.org/ticket/61494
         set doc_dir ${destroot}${prefix}/share/doc/${subport}
         xinstall -m 755 -d ${doc_dir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        system "echo ${subport} gcc9 specific runtime > ${doc_dir}/README"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        system "echo ${subport} provides gcc9 specific runtime > ${doc_dir}/README"
</span> 
         # Create temporary lib dir
         file mkdir ${destroot}${prefix}/lib/libgcc.merged
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc9/files/fix-sanitisers-darwin20.diff b/lang/gcc9/files/fix-sanitisers-darwin20.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..362eb305415
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc9/files/fix-sanitisers-darwin20.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libsanitizer/configure.tgt.orig        2020-11-18 18:57:16.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libsanitizer/configure.tgt     2020-11-18 18:57:16.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -63,6 +63,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   x86_64-*-darwin1[2-9]* | i?86-*-darwin1[2-9]*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   TSAN_SUPPORTED=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  x86_64-*-darwin2[0-9]* | i?86-*-darwin2[0-9]*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  TSAN_SUPPORTED=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   x86_64-*-solaris2.11* | i?86-*-solaris2.11*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   riscv64-*-linux*)
</span></pre><pre style='margin:0'>

</pre>