<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/488a88d87360a46719a8821b7d968a112507e79d">https://github.com/macports/macports-ports/commit/488a88d87360a46719a8821b7d968a112507e79d</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 488a88d8736 darwin-xtools: use 2.2.4 on PPC (x86 unchanged)
</span>488a88d8736 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 488a88d87360a46719a8821b7d968a112507e79d
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Thu May 18 08:09:05 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> darwin-xtools: use 2.2.4 on PPC (x86 unchanged)
</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/67432
</span>---
devel/darwin-xtools/Portfile | 45 ++++++++++++++--------
.../files/0016-Minor-fix-ups-for-ppc.patch | 43 +++++++++++++++++++++
2 files changed, 73 insertions(+), 15 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 861f8e43d81..99517c8f02f 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;'>@@ -4,13 +4,36 @@ PortSystem 1.0
</span> PortGroup cmake 1.1
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set xtools_version 6446947f3e99db52a40b30a38f36b9ae33492aea
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.arch} eq "powerpc"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set xtools_version 6f6c04e8b25497851f6a5979a6e96023fffe22df
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup iains darwin-xtools ${xtools_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 2.2.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums ${name}-${xtools_version}.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 07dd50453b93f90ea4806fd8c12be3acb91c2fbd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7568104068614b8e8b1cb72fcc01219f78f90a0d14d95c255be78e2c0a899d62 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2932788
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set xtools_version 6446947f3e99db52a40b30a38f36b9ae33492aea
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup iains darwin-xtools ${xtools_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums ${name}-${xtools_version}.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 18d99473a012f4fa48464aadd078921a25bdc322 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9167b67e128f616cef079bbeda4b116fe0d41fe54784fff85826420daae23f5f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2958759
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set libyaml_version 0.2.5
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set libyaml_distfile ${libyaml_version}.tar.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distfiles-append ${libyaml_distfile}:libyaml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums-append ${libyaml_distfile} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 7fe42b7d7bb0dd07aedee6c775c43fd35bb5cf3e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 fa240dbf262be053f3898006d502d514936c818e422afdcf33921c63bed9bf2e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 85055
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup iains darwin-xtools ${xtools_version}
</span> github.tarball_from archive
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.3.0
</span> revision 0
epoch 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,18 +49,6 @@ homepage https://github.com/iains/darwin-xtools
</span>
master_sites-append https://github.com/yaml/libyaml/archive/refs/tags:libyaml
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set libyaml_distfile ${libyaml_version}.tar.gz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distfiles-append ${libyaml_distfile}:libyaml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums ${name}-${xtools_version}.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 18d99473a012f4fa48464aadd078921a25bdc322 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9167b67e128f616cef079bbeda4b116fe0d41fe54784fff85826420daae23f5f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2958759 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${libyaml_distfile} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 7fe42b7d7bb0dd07aedee6c775c43fd35bb5cf3e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 fa240dbf262be053f3898006d502d514936c818e422afdcf33921c63bed9bf2e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 85055
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> patchfiles-append 0001-ld64-unwinddump-include-stdlib-for-exit-3.patch \
0002-ld64-archive_file-fix-compilation-without-LTO_SUPPOR.patch \
0003-cctools-cmake-as-fix-compilation-on-powerpc-apple-da.patch \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,6 +65,10 @@ patchfiles-append 0001-ld64-unwinddump-include-stdlib-for-exit-3.patch
</span> 0014-cctools-removed-redundant-implementation-of-get_toc_.patch \
0015-tapilite-fix-build-by-clang.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin powerpc {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append 0016-Minor-fix-ups-for-ppc.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-extract {
ln -s ${workpath}/libyaml-${libyaml_version} ${worksrcpath}/libyaml
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/darwin-xtools/files/0016-Minor-fix-ups-for-ppc.patch b/devel/darwin-xtools/files/0016-Minor-fix-ups-for-ppc.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b38965e57e7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/darwin-xtools/files/0016-Minor-fix-ups-for-ppc.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,43 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From b7e635efd894116530e4fc15847de0aab5915b7e Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 18 May 2023 02:51:49 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Minor fix-ups for ppc
</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;'>+ cctools/misc/strings.c | 6 +++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ld64/src/ld/Options.cpp | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 6 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git cctools/misc/strings.c cctools/misc/strings.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e8d62a7..93d8fea 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cctools/misc/strings.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cctools/misc/strings.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -354,7 +354,11 @@ void *cookie)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * If the ofile is not an object file then process it without reguard
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * to sections.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(ofile->object_addr == NULL || ofile->member_type == OFILE_LLVM_BITCODE){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(ofile->object_addr == NULL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef LTO_SUPPORT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ || ofile->member_type == OFILE_LLVM_BITCODE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif /* LTO_SUPPORT */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(ofile->file_type == OFILE_FAT && ofile->arch_flag.cputype != 0){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(ofile->fat_header->magic == FAT_MAGIC_64){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ addr = ofile->file_addr +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git ld64/src/ld/Options.cpp ld64/src/ld/Options.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0ab643d..be01832 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ld64/src/ld/Options.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ld64/src/ld/Options.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1704,7 +1704,7 @@ uint32_t Options::parseVersionNumber32(const char* versionString)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ z = strtoul(&end[1], &end, 10);
</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 ( (*end != '\0') || (x > 0xffff) || (y > 0xff) || (z > 0xff) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ( (x > 0xffff) || (y > 0xff) || (z > 0xff) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ throwf("malformed 32-bit x.y.z version number: %s", versionString);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (x << 16) | ( y << 8 ) | z;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.40.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>