<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/958cd48b9b7894db75717577d4d954d848a9574e">https://github.com/macports/macports-ports/commit/958cd48b9b7894db75717577d4d954d848a9574e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 958cd48b9b7894db75717577d4d954d848a9574e
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Wed Jan 27 11:46:29 2021 -0800
<span style='display:block; white-space:pre;color:#404040;'> cctools @949: fix bug in as/write_object.c
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> +# there is a bug in cctools as/write_object.c in 949 that needs upstreaming
</span><span style='display:block; white-space:pre;color:#404040;'> small error in a tweak to reduce warnings
</span><span style='display:block; white-space:pre;color:#404040;'> see https://github.com/macports/macports-ports/pull/9796
</span>---
devel/cctools/Portfile | 7 ++++++-
.../cctools/files/cctools-949-write_object-fix.diff | 20 ++++++++++++++++++++
2 files changed, 26 insertions(+), 1 deletion(-)
<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 7666bbe6fa1..73cd089dcc3 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;'>@@ -43,7 +43,12 @@ patchfiles cctools-829-lto.patch \
</span> cctools-949-libstuff-add-args-c.diff \
cctools-949-redo_prebinding-add-segg-addr-table-header.diff \
cctools-949-build-with-SDKs-older-than-1012.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- cctools-949-nm-allow-no-lto-support.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cctools-949-nm-allow-no-lto-support.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cctools-949-write_object-fix.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# small fixes and sdk adjustments made to 949 but
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# there is a bug in cctools as/write_object.c in 949 that needs upstreaming
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://github.com/macports/macports-ports/pull/9796
</span>
post-patch {
if {![variant_isset xcode]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cctools/files/cctools-949-write_object-fix.diff b/devel/cctools/files/cctools-949-write_object-fix.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a1e72b8ce4f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cctools/files/cctools-949-write_object-fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./as/write_object.c.orig 2021-01-27 11:08:23.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./as/write_object.c 2021-01-27 11:09:23.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1260,7 +1260,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return(2 * sizeof(struct relocation_info));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* the #if that follows is to silence a noisy "unreachable code" warning */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(ARM) || defined(SPARC) || defined(HPPA) || defined (PPC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* #if defined(ARM) || defined(SPARC) || defined(HPPA) || defined (PPC) */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef PPC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(fixP->fx_r_type == PPC_RELOC_HI16)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sectdiff = PPC_RELOC_HI16_SECTDIFF;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1387,7 +1387,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *riP = *((struct relocation_info *)&sri);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return(2 * sizeof(struct relocation_info));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif /* unreachable code */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/*#endif*/ /* unreachable code */
</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;'>+ * Determine if this is left as a local relocation entry or must be
</span></pre><pre style='margin:0'>
</pre>