<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/158da96030c4572fa1e876ef8d7a0d43b897bcc1">https://github.com/macports/macports-ports/commit/158da96030c4572fa1e876ef8d7a0d43b897bcc1</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 158da96030c gcc{7,8,9}: fix patch to disable macports cctools as
</span>158da96030c is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 158da96030c4572fa1e876ef8d7a0d43b897bcc1
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Sun Nov 19 08:58:38 2023 +0000

<span style='display:block; white-space:pre;color:#404040;'>    gcc{7,8,9}: fix patch to disable macports cctools as
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/68730
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    [skip ci]
</span>---
 .../patch-gcc7-disable-macports-cctools-as-changes.diff |  8 ++++----
 lang/gcc8/Portfile                                      |  2 +-
 ...patch-gcc10-disable-macports-cctools-as-changes.diff | 17 -----------------
 .../patch-gcc7-disable-macports-cctools-as-changes.diff |  8 ++++----
 lang/gcc9/Portfile                                      |  2 +-
 ...patch-gcc10-disable-macports-cctools-as-changes.diff | 17 -----------------
 .../patch-gcc7-disable-macports-cctools-as-changes.diff |  8 ++++----
 7 files changed, 14 insertions(+), 48 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc7/files/patch-gcc7-disable-macports-cctools-as-changes.diff b/lang/gcc7/files/patch-gcc7-disable-macports-cctools-as-changes.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index eecc07b006f..0b3f34480cf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc7/files/patch-gcc7-disable-macports-cctools-as-changes.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc7/files/patch-gcc7-disable-macports-cctools-as-changes.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span> diff --git Makefile.in Makefile.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 30e037e0f..2636f57b7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b824e0a0ca1..f4c9891826d 100644
</span> --- Makefile.in
 +++ Makefile.in
 @@ -597,6 +597,12 @@ all:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,6 +12,6 @@ index 30e037e0f..2636f57b7 100644
</span> +POSTSTAGE1_HOST_EXPORTS += export DISABLE_MACPORTS_AS_CLANG_SEARCH=1;
 +POSTSTAGE1_HOST_EXPORTS += export DISABLE_XCODE_AS_CLANG_SEARCH=1;
 +
<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:#e0ffe0;'>+ # This is the list of directories that may be needed in RPATH_ENVVAR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # so that programs built for the target machine work.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TARGET_LIB_PATH = $(TARGET_LIB_PATH_libstdc++-v3)$(TARGET_LIB_PATH_libsanitizer)$(TARGET_LIB_PATH_libmpx)$(TARGET_LIB_PATH_libvtv)$(TARGET_LIB_PATH_libcilkrts)$(TARGET_LIB_PATH_liboffloadmic)$(TARGET_LIB_PATH_libssp)$(TARGET_LIB_PATH_libgomp)$(TARGET_LIB_PATH_libitm)$(TARGET_LIB_PATH_libatomic)$(HOST_LIB_PATH_gcc)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc8/Portfile b/lang/gcc8/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3d5d193f356..8d5f22f53e3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc8/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc8/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,7 +78,7 @@ if { ${configure.build_arch} eq "i386"} {
</span> # See:
 #  - https://trac.macports.org/ticket/68683
 #  - https://github.com/gcc-mirror/gcc/commit/b410cf1dc056aab195c5408871ffca932df8a78a
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append   patch-gcc10-disable-macports-cctools-as-changes.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append   patch-gcc7-disable-macports-cctools-as-changes.diff
</span> 
 configure.env-append \
                     DISABLE_MACPORTS_AS_CLANG_SEARCH=1 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc8/files/patch-gcc10-disable-macports-cctools-as-changes.diff b/lang/gcc8/files/patch-gcc10-disable-macports-cctools-as-changes.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f92b30c468d..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc8/files/patch-gcc10-disable-macports-cctools-as-changes.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +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 2f1b928..19a9b42 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;'>-@@ -643,6 +643,12 @@ 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;'>-+# override MacPorts cctools modifications to allow standard gas assembler  to be used
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+HOST_EXPORTS            += export DISABLE_MACPORTS_AS_CLANG_SEARCH=1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+HOST_EXPORTS            += export DISABLE_XCODE_AS_CLANG_SEARCH=1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+POSTSTAGE1_HOST_EXPORTS += export DISABLE_MACPORTS_AS_CLANG_SEARCH=1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+POSTSTAGE1_HOST_EXPORTS += export DISABLE_XCODE_AS_CLANG_SEARCH=1;
</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;color:#808080;'>diff --git a/lang/gcc7/files/patch-gcc7-disable-macports-cctools-as-changes.diff b/lang/gcc8/files/patch-gcc7-disable-macports-cctools-as-changes.diff
</span>similarity index 50%
copy from lang/gcc7/files/patch-gcc7-disable-macports-cctools-as-changes.diff
copy to lang/gcc8/files/patch-gcc7-disable-macports-cctools-as-changes.diff
<span style='display:block; white-space:pre;color:#808080;'>index eecc07b006f..0b3f34480cf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc7/files/patch-gcc7-disable-macports-cctools-as-changes.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc8/files/patch-gcc7-disable-macports-cctools-as-changes.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span> diff --git Makefile.in Makefile.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 30e037e0f..2636f57b7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b824e0a0ca1..f4c9891826d 100644
</span> --- Makefile.in
 +++ Makefile.in
 @@ -597,6 +597,12 @@ all:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,6 +12,6 @@ index 30e037e0f..2636f57b7 100644
</span> +POSTSTAGE1_HOST_EXPORTS += export DISABLE_MACPORTS_AS_CLANG_SEARCH=1;
 +POSTSTAGE1_HOST_EXPORTS += export DISABLE_XCODE_AS_CLANG_SEARCH=1;
 +
<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:#e0ffe0;'>+ # This is the list of directories that may be needed in RPATH_ENVVAR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # so that programs built for the target machine work.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TARGET_LIB_PATH = $(TARGET_LIB_PATH_libstdc++-v3)$(TARGET_LIB_PATH_libsanitizer)$(TARGET_LIB_PATH_libmpx)$(TARGET_LIB_PATH_libvtv)$(TARGET_LIB_PATH_libcilkrts)$(TARGET_LIB_PATH_liboffloadmic)$(TARGET_LIB_PATH_libssp)$(TARGET_LIB_PATH_libgomp)$(TARGET_LIB_PATH_libitm)$(TARGET_LIB_PATH_libatomic)$(HOST_LIB_PATH_gcc)
</span><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 d35e4723cae..92598d17bea 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;'>@@ -65,7 +65,7 @@ if { ${configure.build_arch} eq "i386" } {
</span> # See:
 #  - https://trac.macports.org/ticket/68683
 #  - https://github.com/gcc-mirror/gcc/commit/b410cf1dc056aab195c5408871ffca932df8a78a
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append   patch-gcc10-disable-macports-cctools-as-changes.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append   patch-gcc7-disable-macports-cctools-as-changes.diff
</span> 
 configure.env-append \
                     DISABLE_MACPORTS_AS_CLANG_SEARCH=1 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc9/files/patch-gcc10-disable-macports-cctools-as-changes.diff b/lang/gcc9/files/patch-gcc10-disable-macports-cctools-as-changes.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f92b30c468d..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc9/files/patch-gcc10-disable-macports-cctools-as-changes.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +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 2f1b928..19a9b42 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;'>-@@ -643,6 +643,12 @@ 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;'>-+# override MacPorts cctools modifications to allow standard gas assembler  to be used
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+HOST_EXPORTS            += export DISABLE_MACPORTS_AS_CLANG_SEARCH=1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+HOST_EXPORTS            += export DISABLE_XCODE_AS_CLANG_SEARCH=1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+POSTSTAGE1_HOST_EXPORTS += export DISABLE_MACPORTS_AS_CLANG_SEARCH=1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+POSTSTAGE1_HOST_EXPORTS += export DISABLE_XCODE_AS_CLANG_SEARCH=1;
</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;color:#808080;'>diff --git a/lang/gcc7/files/patch-gcc7-disable-macports-cctools-as-changes.diff b/lang/gcc9/files/patch-gcc7-disable-macports-cctools-as-changes.diff
</span>similarity index 50%
copy from lang/gcc7/files/patch-gcc7-disable-macports-cctools-as-changes.diff
copy to lang/gcc9/files/patch-gcc7-disable-macports-cctools-as-changes.diff
<span style='display:block; white-space:pre;color:#808080;'>index eecc07b006f..0b3f34480cf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc7/files/patch-gcc7-disable-macports-cctools-as-changes.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc9/files/patch-gcc7-disable-macports-cctools-as-changes.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span> diff --git Makefile.in Makefile.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 30e037e0f..2636f57b7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b824e0a0ca1..f4c9891826d 100644
</span> --- Makefile.in
 +++ Makefile.in
 @@ -597,6 +597,12 @@ all:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,6 +12,6 @@ index 30e037e0f..2636f57b7 100644
</span> +POSTSTAGE1_HOST_EXPORTS += export DISABLE_MACPORTS_AS_CLANG_SEARCH=1;
 +POSTSTAGE1_HOST_EXPORTS += export DISABLE_XCODE_AS_CLANG_SEARCH=1;
 +
<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:#e0ffe0;'>+ # This is the list of directories that may be needed in RPATH_ENVVAR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # so that programs built for the target machine work.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TARGET_LIB_PATH = $(TARGET_LIB_PATH_libstdc++-v3)$(TARGET_LIB_PATH_libsanitizer)$(TARGET_LIB_PATH_libmpx)$(TARGET_LIB_PATH_libvtv)$(TARGET_LIB_PATH_libcilkrts)$(TARGET_LIB_PATH_liboffloadmic)$(TARGET_LIB_PATH_libssp)$(TARGET_LIB_PATH_libgomp)$(TARGET_LIB_PATH_libitm)$(TARGET_LIB_PATH_libatomic)$(HOST_LIB_PATH_gcc)
</span></pre><pre style='margin:0'>

</pre>