<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/a079d1b3fb82435bc1251074178e66966de9c909">https://github.com/macports/macports-ports/commit/a079d1b3fb82435bc1251074178e66966de9c909</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 a079d1b3fb8 cctools: move to github
</span>a079d1b3fb8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a079d1b3fb82435bc1251074178e66966de9c909
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Wed Apr 26 22:47:02 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> cctools: move to github
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> + stealth update for changed distfile
</span><span style='display:block; white-space:pre;color:#404040;'> + tweak patches to apply cleanly
</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/66436
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Co-Authored-By: Michael Dickens <michaelld@macports.org>
</span>---
devel/cctools/Portfile | 31 ++++++++++++++-----------
devel/cctools/files/PR-12400897.patch | 12 +++++-----
devel/cctools/files/cctools-829-lto.patch | 8 +++----
devel/cctools/files/cctools-862-prunetrie.patch | 14 +++++------
devel/cctools/files/cctools-921-noavx512.patch | 17 +++++++-------
devel/cctools/files/snowleopard-strnlen.patch | 8 +++----
6 files changed, 47 insertions(+), 43 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cctools/Portfile b/devel/cctools/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index acc8cf2e1cc..04956342e95 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cctools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cctools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,6 +9,9 @@ version 949.0.1
</span> set ld64_version 530
revision 2
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# simulate stealth update; remove with next version change
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+dist_subdir ${name}/${version}_1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories devel
maintainers {jeremyhu @jeremyhu} openmaintainer
license {APSL-2 GPL-2+}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,22 +22,21 @@ long_description A set of essential tools to support development \
</span> to binutils on other platforms.
homepage https://opensource.apple.com/source/${name}/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#master_sites https://opensource.apple.com/tarballs/${name}:main \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://opensource.apple.com/tarballs/ld64:ld64
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Stealth update
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites macports_distfiles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distfiles ${name}-${version}.tar.gz:main \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ld64-${ld64_version}.tar.gz:ld64
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distfiles ld64-${ld64_version}.tar.gz:ld64 ${name}-${version}.tar.gz:main
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://github.com/apple-oss-distributions/cctools/archive/:main \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https://github.com/apple-oss-distributions/ld64/archive/ld64-${ld64_version}:ld64
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums ld64-530.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 793d012a611de5a044db3f97c6a9ec149072aff6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ee37f0487601c08c7d133bc91cad2e9084d00d02aa4709d228a9a065960aa187 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 744871 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cctools-949.0.1.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 6412d9c5aea6aadd88cd9abdde6c1383f103b582 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 830485ac7c563cd55331f643952caab2f0690dfbd01e92eb432c45098b28a5d0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1968671
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums cctools-949.0.1.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 54a8e318087547b827eee4e5dbb21a8f3956402f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8b2d8dc371a57e42852fa6102efaf324ef004adf86072bf9957e2ac9005326c1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1967695 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ld64-530.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 57d6629f31180b53f6f6a324a28e723611bd3cfb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a21de4c2d4cd3ebf13c887eebbafc4b58ff0ee5bb07e592ba12690fb28a9cb17 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 729897
</span>
patchfiles cctools-829-lto.patch \
PR-37520.patch \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -195,6 +197,9 @@ if {![variant_isset xcode] && ![variant_isset xtools]} {
</span>
post-extract {
if {![variant_isset xcode] && ![variant_isset xtools]} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${workpath}/cctools-cctools-${version} ${workpath}/cctools-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${workpath}/ld64-ld64-${ld64_version} ${workpath}/ld64-${ld64_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> file copy ${worksrcpath}/../ld64-${ld64_version}/src/other/PruneTrie.cpp ${worksrcpath}/misc
system "touch ${worksrcpath}/../ld64-${ld64_version}/src/abstraction/configure.h"
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cctools/files/PR-12400897.patch b/devel/cctools/files/PR-12400897.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 8a2ac5003f2..b61ba4f318b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cctools/files/PR-12400897.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cctools/files/PR-12400897.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +1,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- misc/nm.c 1969-12-31 16:00:00.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ misc/nm.c 2012-09-29 12:36:22.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -496,7 +496,7 @@ void *cookie)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- misc/nm.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ misc/nm.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -519,7 +519,7 @@ void *cookie)
</span> uint32_t nsymbols;
struct value_diff *value_diffs;
- char *short_name, *has_suffix;
+ char *short_name, *suffix;
enum bool is_framework;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cmd_flags = (struct cmd_flags *)cookie;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -650,9 +650,20 @@ void *cookie)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef LTO_SUPPORT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *llvm_bundle_pointer;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -755,9 +755,20 @@ void *cookie)
</span> process_flags.lib_names[j] =
(char *)dl + dl->dylib.name.offset;
short_name = guess_short_name(process_flags.lib_names[j],
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cctools/files/cctools-829-lto.patch b/devel/cctools/files/cctools-829-lto.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 79c811a882d..316fe4233b3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cctools/files/cctools-829-lto.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cctools/files/cctools-829-lto.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libstuff/lto.c.orig 1969-12-31 16:00:00.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libstuff/lto.c 2012-09-04 14:59:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -112,13 +112,21 @@ void **pmod) /* maybe NULL */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libstuff/lto.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libstuff/lto.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -115,13 +115,21 @@
</span> lto_path = makestr(prefix, "../lib/libLTO.dylib", NULL);
lto_handle = dlopen(lto_path, RTLD_NOW);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +28,7 @@
</span> }
if(lto_handle == NULL)
return(0);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -142,8 +150,6 @@ void **pmod) /* maybe NULL */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -147,8 +155,6 @@
</span> lto_get_sym_attr == NULL ||
lto_get_sym_name == NULL){
dlclose(lto_handle);
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cctools/files/cctools-862-prunetrie.patch b/devel/cctools/files/cctools-862-prunetrie.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index ebe7d9a14c8..5fa753f23ce 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cctools/files/cctools-862-prunetrie.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cctools/files/cctools-862-prunetrie.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- misc/Makefile.orig 2015-01-10 20:43:30.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ misc/Makefile 2015-01-10 20:51:27.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -201,14 +201,18 @@ indr.NEW: indr.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- misc/Makefile.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ misc/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -203,14 +203,18 @@
</span> $(OFILE_DIR)/indr.private.o
$(DSYMUTIL) $(SYMROOT)/indr.NEW
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,11 +21,11 @@
</span> nmedit.NEW: nmedit.o
$(CC) $(RC_CFLAGS) -nostdlib -r \
-o $(OBJROOT)/nmedit.private.o \
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- misc/strip.c.orig 2015-01-10 21:25:17.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ misc/strip.c 2015-01-10 21:25:40.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -47,7 +47,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "stuff/unix_standard_mode.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- misc/strip.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ misc/strip.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -48,7 +48,7 @@
</span> #include "stuff/execute.h"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "stuff/write64.h"
</span> #ifdef TRIE_SUPPORT
-#include <mach-o/prune_trie.h>
+#include "prune_trie.h"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cctools/files/cctools-921-noavx512.patch b/devel/cctools/files/cctools-921-noavx512.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index b9aa4786ac8..cb9ef7037c5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cctools/files/cctools-921-noavx512.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cctools/files/cctools-921-noavx512.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Naurp cctools-921.orig/include/mach/i386/thread_status.h cctools-921/include/mach/i386/thread_status.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- include/mach/i386/thread_status.h 2018-10-04 15:13:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/mach/i386/thread_status.h 2018-11-07 14:22:53.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/mach/i386/thread_status.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/mach/i386/thread_status.h
</span> @@ -115,9 +115,6 @@
#define x86_AVX_STATE32 16
#define x86_AVX_STATE64 (x86_AVX_STATE32 + 1)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,9 +8,9 @@ diff -Naurp cctools-921.orig/include/mach/i386/thread_status.h cctools-921/inclu
</span> -#define x86_AVX512_STATE64 (x86_AVX512_STATE32 + 1)
-#define x86_AVX512_STATE (x86_AVX512_STATE32 + 2)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> /*
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -148,9 +145,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Largest state on this machine:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -147,9 +144,6 @@
</span> (x == x86_AVX_STATE32) || \
(x == x86_AVX_STATE64) || \
(x == x86_AVX_STATE) || \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,7 +20,7 @@ diff -Naurp cctools-921.orig/include/mach/i386/thread_status.h cctools-921/inclu
</span> (x == THREAD_STATE_NONE))
struct x86_state_hdr {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -194,10 +188,6 @@ typedef _STRUCT_X86_AVX_STATE32 x86_avx_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -193,10 +187,6 @@
</span> #define x86_AVX_STATE32_COUNT ((mach_msg_type_number_t) \
(sizeof(x86_avx_state32_t)/sizeof(unsigned int)))
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,7 +31,7 @@ diff -Naurp cctools-921.orig/include/mach/i386/thread_status.h cctools-921/inclu
</span> /*
* to be deprecated in the future
*/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -229,10 +219,6 @@ typedef _STRUCT_X86_AVX_STATE64 x86_avx_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -228,10 +218,6 @@
</span> #define x86_AVX_STATE64_COUNT ((mach_msg_type_number_t) \
(sizeof(x86_avx_state64_t)/sizeof(unsigned int)))
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,7 +42,7 @@ diff -Naurp cctools-921.orig/include/mach/i386/thread_status.h cctools-921/inclu
</span> typedef _STRUCT_X86_EXCEPTION_STATE64 x86_exception_state64_t;
#define x86_EXCEPTION_STATE64_COUNT ((mach_msg_type_number_t) \
( sizeof (x86_exception_state64_t) / sizeof (int) ))
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -288,14 +274,6 @@ struct x86_avx_state {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -287,14 +273,6 @@
</span> } ufs;
};
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,7 +57,7 @@ diff -Naurp cctools-921.orig/include/mach/i386/thread_status.h cctools-921/inclu
</span> typedef struct x86_thread_state x86_thread_state_t;
#define x86_THREAD_STATE_COUNT ((mach_msg_type_number_t) \
( sizeof (x86_thread_state_t) / sizeof (int) ))
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -316,10 +294,6 @@ typedef struct x86_avx_state x86_avx_sta
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -315,10 +293,6 @@
</span> #define x86_AVX_STATE_COUNT ((mach_msg_type_number_t) \
(sizeof(x86_avx_state_t)/sizeof(unsigned int)))
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cctools/files/snowleopard-strnlen.patch b/devel/cctools/files/snowleopard-strnlen.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 80e3b82e3b2..6ec06a5facc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cctools/files/snowleopard-strnlen.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cctools/files/snowleopard-strnlen.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- otool/ofile_print.c.orig 2013-11-10 22:33:14.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ otool/ofile_print.c 2013-11-10 22:34:19.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -225,6 +225,18 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "stuff/guess_short_name.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- otool/ofile_print.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ otool/ofile_print.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -227,6 +227,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "dyld_bind_info.h"
</span> #include "ofile_print.h"
+static size_t
</pre><pre style='margin:0'>
</pre>