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

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/50c00f72a29d3e1a47a298fc5fec65ce8faf0172">https://github.com/macports/macports-ports/commit/50c00f72a29d3e1a47a298fc5fec65ce8faf0172</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 50c00f72a29 darwin-xtools: fix universal build on legacy OS
</span>50c00f72a29 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 50c00f72a29d3e1a47a298fc5fec65ce8faf0172
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Tue May 23 11:35:03 2023 +0200

<span style='display:block; white-space:pre;color:#404040;'>    darwin-xtools: fix universal build on legacy OS
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    I've also increased epoch for powerpc version which is mandatory since
</span><span style='display:block; white-space:pre;color:#404040;'>    it was downgraded before.
</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/67480
</span>---
 devel/darwin-xtools/Portfile | 44 +++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 39 insertions(+), 5 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/darwin-xtools/Portfile b/devel/darwin-xtools/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 99517c8f02f..828586f7f05 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/darwin-xtools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/darwin-xtools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,11 +3,14 @@
</span> PortSystem                  1.0
 PortGroup                   cmake 1.1
 PortGroup                   github 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup                   muniversal 1.0
</span> 
 if {${os.arch} eq "powerpc"} {
     set xtools_version      6f6c04e8b25497851f6a5979a6e96023fffe22df
     github.setup            iains darwin-xtools ${xtools_version}
     version                 2.2.4
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    revision                1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    epoch                   1
</span> 
     checksums               ${name}-${xtools_version}.tar.gz \
                             rmd160  07dd50453b93f90ea4806fd8c12be3acb91c2fbd \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,6 +20,8 @@ if {${os.arch} eq "powerpc"} {
</span>     set xtools_version      6446947f3e99db52a40b30a38f36b9ae33492aea
     github.setup            iains darwin-xtools ${xtools_version}
     version                 3.3.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    revision                1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    epoch                   0
</span> 
     checksums               ${name}-${xtools_version}.tar.gz \
                             rmd160  18d99473a012f4fa48464aadd078921a25bdc322 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,9 +39,6 @@ checksums-append            ${libyaml_distfile} \
</span> 
 github.tarball_from         archive
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision                    0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-epoch                       0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> platforms                   darwin
 categories                  devel
 maintainers                 {@catap korins.ky:kirill} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,13 +89,45 @@ configure.ldflags-delete  -L${prefix}/lib
</span> 
 compiler.cxx_standard       2011
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+merger_arch_flag            yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+merger_arch_compiler        yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+merger_must_run_binaries    yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${os.platform} eq "darwin" && ${os.major} < 12} {
     depends_build-append    port:gcc10-bootstrap
     depends_skip_archcheck-append \
                             gcc10-bootstrap
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.cc            ${prefix}/libexec/gcc10-bootstrap/bin/gcc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.cxx           ${prefix}/libexec/gcc10-bootstrap/bin/g++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # Leopard is the first macOS which supports Roseta
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # See: https://trac.macports.org/ticket/67284
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {${os.major} > 8} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            file mkdir ${workpath}/bins
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            set gcc [open "${workpath}/bins/gcc" w 0755]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            puts ${gcc} "#!/bin/sh"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            puts ${gcc} "arch -arch $\{BUILD_ARCH:-${build_arch}\} ${prefix}/libexec/gcc10-bootstrap/bin/gcc \"\$@\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            close ${gcc}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            set gxx [open "${workpath}/bins/g++" w 0755]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            puts ${gxx} "#!/bin/sh"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            puts ${gxx} "arch -arch $\{BUILD_ARCH:-${build_arch}\} ${prefix}/libexec/gcc10-bootstrap/bin/g++ \"\$@\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            close ${gxx}
</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;'>+        configure.cc        ${workpath}/bins/gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.cxx       ${workpath}/bins/g++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {[variant_exists universal] && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            foreach arch ${universal_archs_supported} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                lappend merger_configure_env(${arch}) BUILD_ARCH=${arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                lappend merger_build_env(${arch}) BUILD_ARCH=${arch}
</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;'>+    } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.cc        ${prefix}/libexec/gcc10-bootstrap/bin/gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.cxx       ${prefix}/libexec/gcc10-bootstrap/bin/g++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> 
     # prevent it from linking against gcc's libstdc++.6.dylib and libgcc_s.1.1.dylib
     configure.ldflags-append \
</pre><pre style='margin:0'>

</pre>