<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/4abb2e5109fed79103b78fd349287d41638e9806">https://github.com/macports/macports-ports/commit/4abb2e5109fed79103b78fd349287d41638e9806</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 4abb2e5109fed79103b78fd349287d41638e9806
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Mon Dec 26 20:09:13 2022 -0800
<span style='display:block; white-space:pre;color:#404040;'> muniversal-*: trim diffutils-for-muniversal use
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> only require it if building universal
</span><span style='display:block; white-space:pre;color:#404040;'> closes: https://trac.macports.org/ticket/66452
</span>---
_resources/port1.0/group/muniversal-1.0.tcl | 26 +++++++++++++-------------
_resources/port1.0/group/muniversal-1.1.tcl | 20 +++++++++++---------
2 files changed, 24 insertions(+), 22 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/muniversal-1.0.tcl b/_resources/port1.0/group/muniversal-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index d72af696f02..bc8bd0998e5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/muniversal-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/muniversal-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,19 +33,6 @@ default merger_no_3_archs no
</span> default merger_arch_flag yes
default merger_arch_compiler no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} >= 22} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:diffutils-for-muniversal
</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;'>-proc muniversal_get_diff_to_use {} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global prefix os.platform os.major
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.platform} eq "darwin" && ${os.major} >= 22} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return "${prefix}/libexec/diffutils/bin/diff"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return "/usr/bin/diff"
</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;'>-
</span> proc muniversal_arch_flag_supported {args} {
global configure.compiler
return [regexp {^gcc-4|llvm|apple|clang} ${configure.compiler}]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -214,6 +201,19 @@ variant universal {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && ${os.major} >= 22} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:diffutils-for-muniversal
</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;'>+ proc muniversal_get_diff_to_use {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global prefix os.platform os.major
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && ${os.major} >= 22} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "${prefix}/libexec/diffutils/bin/diff"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "/usr/bin/diff"
</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;'>+
</span> # Disabling dependency tracking is only required when building for
# multiple architectures simultaneously.
configure.universal_args-delete --disable-dependency-tracking
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/muniversal-1.1.tcl b/_resources/port1.0/group/muniversal-1.1.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 6e56f38d902..ff9c9d66eca 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/muniversal-1.1.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/muniversal-1.1.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,16 +41,18 @@ default muniversal.dont_diff {}
</span> # utilites
##########################################################################################
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} >= 22} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:diffutils-for-muniversal
</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;'>-proc muniversal_get_diff_to_use {} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global prefix os.major os.platform
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[option universal_possible] && [variant_isset universal]} {
</span> if {${os.platform} eq "darwin" && ${os.major} >= 22} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "${prefix}/libexec/diffutils/bin/diff"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return "/usr/bin/diff"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:diffutils-for-muniversal
</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;'>+ proc muniversal_get_diff_to_use {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global prefix os.major os.platform
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && ${os.major} >= 22} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "${prefix}/libexec/diffutils/bin/diff"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "/usr/bin/diff"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
</pre><pre style='margin:0'>
</pre>