<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e6dba24b81225836124ed97c1d785e11f86b92a8">https://github.com/macports/macports-ports/commit/e6dba24b81225836124ed97c1d785e11f86b92a8</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e6dba24b81225836124ed97c1d785e11f86b92a8
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Thu Oct 26 20:01:40 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> trash: Only use -force_cpusubtype_ALL on PowerPC
</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/68560
</span>---
sysutils/trash/Portfile | 11 ++++++++++-
sysutils/trash/files/patch-Makefile.diff | 6 +++---
2 files changed, 13 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/trash/Portfile b/sysutils/trash/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ac16e8ab337..f9401165980 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/trash/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/trash/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,11 +2,11 @@
</span>
PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup muniversal 1.0
</span>
github.setup ali-rantakari trash 0.9.2 v
revision 0
categories sysutils
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> license MIT
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,6 +24,15 @@ depends_build bin:pod2man:perl5
</span> patchfiles patch-Makefile.diff \
patch-HGUtils.m-lion.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+array set merger_configure_cflags {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ppc -force_cpusubtype_ALL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ppc64 -force_cpusubtype_ALL
</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;'>+if {(!${universal_possible} || ![variant_isset universal]) && [info exists merger_configure_cflags(${configure.build_arch})]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cflags-append {*}$merger_configure_cflags(${configure.build_arch})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.cmd printenv
configure.pre_args
configure.universal_args
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/trash/files/patch-Makefile.diff b/sysutils/trash/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 244396265c2..36f44b416b4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/trash/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/trash/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig 2014-09-23 13:23:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2015-05-22 16:43:12.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig 2018-07-12 02:49:49.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2023-10-26 19:47:50.000000000 -0500
</span> @@ -1,3 +1,4 @@
+include Makefile.macports.inc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@
</span> @echo ---- Compiling:
@echo ======================================
- $(CC) -O2 -Wall -Wextra -Wpartial-availability -Wno-unguarded-availability -force_cpusubtype_ALL -mmacosx-version-min=10.7 -arch i386 -arch x86_64 -framework AppKit -framework ScriptingBridge -o $@ $(SOURCE_FILES)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -Wall -Wextra -Wpartial-availability -Wno-unguarded-availability -force_cpusubtype_ALL -framework AppKit -framework ScriptingBridge -o $@ $(SOURCE_FILES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -Wall -Wextra -Wpartial-availability -Wno-unguarded-availability -framework AppKit -framework ScriptingBridge -o $@ $(SOURCE_FILES)
</span>
analyze:
@echo
</pre><pre style='margin:0'>
</pre>