<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/c619c83eba4ed990cea6ae39a2c08825d2051829">https://github.com/macports/macports-ports/commit/c619c83eba4ed990cea6ae39a2c08825d2051829</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 c619c83eba4 gcc46: fix 32bit build
</span>c619c83eba4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c619c83eba4ed990cea6ae39a2c08825d2051829
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Wed Jul 7 00:03:48 2021 -0700
<span style='display:block; white-space:pre;color:#404040;'> gcc46: fix 32bit build
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> disable MacPorts cctools modifications that use clang as assembler
</span><span style='display:block; white-space:pre;color:#404040;'> if a suitable clang is present. These assembler changes are not tested
</span><span style='display:block; white-space:pre;color:#404040;'> upstream for i386 builds, cause configuration issues that break the 32bit
</span><span style='display:block; white-space:pre;color:#404040;'> build, and cause innumerable assembler warnings about TEXT
</span><span style='display:block; white-space:pre;color:#404040;'> sections being deprecated by clang.
</span>---
lang/gcc46/Portfile | 17 +++++++++++++++++
.../patch-gcc5-disable-macports-cctools-as-changes.diff | 15 +++++++++++++++
2 files changed, 32 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc46/Portfile b/lang/gcc46/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b21b1558a2b..2ee4c8cdaa4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc46/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc46/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,6 +49,23 @@ checksums ${distname}${extract.suffix} \
</span> sha256 98fd128f1d374d9e42fd9d4836bdd249c6d511ebc6c0df17fbc1b9df96c3d781 \
size 1470676
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${configure.build_arch} eq "i386" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # build with traditional "gas" assembler in all cases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # upstream does not typically test gcc with clang as assembler on i386 systems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # gcc configuration changes with assembler features
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # also innumerable warnings about text section naming suppressed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-gcc5-disable-macports-cctools-as-changes.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "DISABLE_MACPORTS_AS_CLANG_SEARCH=1" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "DISABLE_XCODE_AS_CLANG_SEARCH=1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "DISABLE_MACPORTS_AS_CLANG_SEARCH=1" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "DISABLE_XCODE_AS_CLANG_SEARCH=1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib port:cctools \
path:lib/pkgconfig/cloog-isl.pc:cloog \
port:gmp \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc46/files/patch-gcc5-disable-macports-cctools-as-changes.diff b/lang/gcc46/files/patch-gcc5-disable-macports-cctools-as-changes.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..477ae07c5d3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc46/files/patch-gcc5-disable-macports-cctools-as-changes.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.in.orig 2021-07-05 21:24:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.in 2021-07-05 21:25:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -575,6 +575,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @host_makefile_frag@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ###
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# override MacPorts cctools modifications to allow standard gas assembler to be used
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++HOST_EXPORTS += export DISABLE_MACPORTS_AS_CLANG_SEARCH=1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++HOST_EXPORTS += export DISABLE_XCODE_AS_CLANG_SEARCH=1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++POSTSTAGE1_HOST_EXPORTS += export DISABLE_MACPORTS_AS_CLANG_SEARCH=1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++POSTSTAGE1_HOST_EXPORTS += export DISABLE_XCODE_AS_CLANG_SEARCH=1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</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>