<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/c835964b9b98a2f9e1854fd47130f62f5ea506ec">https://github.com/macports/macports-ports/commit/c835964b9b98a2f9e1854fd47130f62f5ea506ec</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 c835964b9b9 gdb-apple: fix build on 10.5/10.6
</span>c835964b9b9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c835964b9b98a2f9e1854fd47130f62f5ea506ec
</span>Author: Evan Miller <emmiller@gmail.com>
AuthorDate: Tue Apr 12 08:23:43 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> gdb-apple: fix build on 10.5/10.6
</span>---
devel/gdb-apple/Portfile | 12 +--
devel/gdb-apple/files/patch-gdb-backtrace.diff | 59 +++++++++++++++
...db-availability.diff => patch-gdb-headers.diff} | 87 ++++------------------
devel/gdb-apple/files/patch-macosx-tdep.c.diff | 11 +++
4 files changed, 92 insertions(+), 77 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gdb-apple/Portfile b/devel/gdb-apple/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4607be0b2f4..17e76ef4fec 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gdb-apple/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gdb-apple/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,19 +37,21 @@ distname gdb-${version}
</span> master_sites http://opensource.apple.com/tarballs/gdb
checksums rmd160 90290c3950dd06c1691a477b9ee302c00b681ed1 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d25b056a826015e1e0ea338b9b8f03e40dce3ff4696faf95df259ae1a42698da
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d25b056a826015e1e0ea338b9b8f03e40dce3ff4696faf95df259ae1a42698da \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 18298209
</span>
depends_build port:gettext port:zlib port:flex port:texinfo
depends_lib port:libiconv port:ncurses port:sqlite3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-macosx-nat.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-gdb-headers.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-macosx-nat.c.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-macosx-tdep.c.diff
</span>
if {${os.platform} eq "darwin" && ${os.major} < 10} {
patchfiles-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-macosx-tdep.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-macosx-nat-threads.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-gdb-availability.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-gdb-backtrace.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-macosx-nat-threads.c.diff
</span>
if {${os.major} == 8} {
depends_build-append port:libmacho-headers
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gdb-apple/files/patch-gdb-backtrace.diff b/devel/gdb-apple/files/patch-gdb-backtrace.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f88a5be84b0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gdb-apple/files/patch-gdb-backtrace.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,59 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Check the deployment target before calling backtrace.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This patch requires patch-gdb-headers.diff.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gdb/remote.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gdb/remote.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -64,7 +64,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "macosx-nat-dyld.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "macosx-nat-dyld-process.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef HAVE_EXECINFO_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <execinfo.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Prototypes for local functions. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void cleanup_sigint_signal_handler (void *dummy);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -478,11 +481,13 @@ struct memory_packet_config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ remote_backtrace_self (const char *message)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (MAC_OS_X_VERSION_MIN_REQUIRED >= 1050)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void *bt_buffer[100];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int count = backtrace (bt_buffer, 100);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (message && message[0])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf_filtered (gdb_stderr, "%s", message);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ backtrace_symbols_fd (bt_buffer, count, STDERR_FILENO);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</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;'>+ static void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gdb/utils.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gdb/utils.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,7 +28,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "event-top.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "exceptions.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "bfd.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef HAVE_EXECINFO_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <execinfo.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/resource.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <uuid/uuid.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <regex.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -882,12 +885,14 @@ internal_vproblem (struct internal_problem *problem,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* APPLE LOCAL: Do a stack crawl of how we got here so we're more likely
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ to get useful bug reports. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (MAC_OS_X_VERSION_MIN_REQUIRED >= 1050)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void *bt_buffer[15];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int count = backtrace (bt_buffer, 15);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf (stderr, "gdb stack crawl at point of internal error:\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ backtrace_symbols_fd (bt_buffer, count, STDERR_FILENO);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Create a string containing the full error/warning message. Need
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ to call query with this full string, as otherwize the reason
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gdb-apple/files/patch-gdb-availability.diff b/devel/gdb-apple/files/patch-gdb-headers.diff
</span>similarity index 61%
rename from devel/gdb-apple/files/patch-gdb-availability.diff
rename to devel/gdb-apple/files/patch-gdb-headers.diff
<span style='display:block; white-space:pre;color:#808080;'>index 22333269883..5987b1aa946 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gdb-apple/files/patch-gdb-availability.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gdb-apple/files/patch-gdb-headers.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,13 +63,13 @@ on 10.4 and 10.5.
</span> else
{
-#if defined (NM_NEXTSTEP)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined (NM_NEXTSTEP) && (MAC_OS_X_VERSION_MIN_REQUIRED >= 1050)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined (NM_NEXTSTEP) && defined(TASK_DYLD_INFO)
</span> if (macosx_status->task == TASK_NULL)
return 0;
--- gdb/macosx/macosx-nat-inferior.c.orig
+++ gdb/macosx/macosx-nat-inferior.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -60,13 +60,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -60,13 +60,17 @@
</span> #include <sys/sysctl.h>
#include <sys/proc.h>
#include <mach/mach_error.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,29 +84,28 @@ on 10.4 and 10.5.
</span> #include <libproc.h>
#include <sys/proc_info.h>
+#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <AvailabilityMacros.h>
</span>
#include "macosx-nat-dyld.h"
#include "macosx-nat-inferior.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2701,6 +2706,7 @@ macosx_get_thread_name (ptid_t ptid)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2701,6 +2705,7 @@ macosx_get_thread_name (ptid_t ptid)
</span> if (tp->private == NULL || tp->private->app_thread_port == 0)
return NULL;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(THREAD_IDENTIFIER_INFO)
</span> thread_identifier_info_data_t tident;
unsigned int info_count;
kern_return_t kret;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2728,6 +2734,7 @@ macosx_get_thread_name (ptid_t ptid)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2728,6 +2733,7 @@ macosx_get_thread_name (ptid_t ptid)
</span> }
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* MAC_OS_X_VERSION_MIN_REQUIRED >= 1050 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif /* defined(THREAD_IDENTIFIER_INFO) */
</span> return buf;
}
--- gdb/macosx/macosx-nat-infthread.c
+++ gdb/macosx/macosx-nat-infthread.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -36,8 +36,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,8 +36,10 @@
</span> #include <sys/dir.h>
#include <inttypes.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -114,94 +113,38 @@ on 10.4 and 10.5.
</span> #include <libproc.h>
#include <sys/proc_info.h>
+#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <AvailabilityMacros.h>
</span>
#include "macosx-nat-inferior.h"
#include "macosx-nat-inferior-util.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -810,6 +813,7 @@ print_thread_info (thread_t tid, int *gdb_thread_id)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -810,6 +812,7 @@ print_thread_info (thread_t tid, int *gdb_thread_id)
</span> print_stack_frame (get_selected_frame (NULL), 0, LOCATION);
switch_to_thread (current_ptid);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(THREAD_IDENTIFIER_INFO)
</span> thread_identifier_info_data_t tident;
info_count = THREAD_IDENTIFIER_INFO_COUNT;
kret = thread_info (tid, THREAD_IDENTIFIER_INFO, (thread_info_t) &tident,
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -879,6 +883,7 @@ print_thread_info (thread_t tid, int *gdb_thread_id)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -879,6 +882,7 @@ print_thread_info (thread_t tid, int *gdb_thread_id)
</span> printf_filtered ("\tcurrent priority: %d\n", pth.pth_priority);
printf_filtered ("\tmax priority: %d\n", pth.pth_maxpriority);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* MAC_OS_X_VERSION_MIN_REQUIRED >= 1050 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif /* defined(THREAD_IDENTIFIER_INFO) */
</span>
printf_filtered ("\tsuspend count: %d", info.suspend_count);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1176,6 +1181,7 @@ macosx_print_thread_details (struct ui_out *uiout, ptid_t ptid)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1176,6 +1180,7 @@ macosx_print_thread_details (struct ui_out *uiout, ptid_t ptid)
</span> ui_out_field_fmt (uiout, "mach-port-number", "0x%s",
paddr_nz (app_thread_name));
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(THREAD_IDENTIFIER_INFO)
</span> thread_identifier_info_data_t tident;
info_count = THREAD_IDENTIFIER_INFO_COUNT;
kret = thread_info (tid, THREAD_IDENTIFIER_INFO, (thread_info_t) &tident,
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1208,6 +1214,7 @@ macosx_print_thread_details (struct ui_out *uiout, ptid_t ptid)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1208,6 +1213,7 @@ macosx_print_thread_details (struct ui_out *uiout, ptid_t ptid)
</span> paddr_nz (struct_addr));
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* MAC_OS_X_VERSION_MIN_REQUIRED >= 1050 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif /* defined(THREAD_IDENTIFIER_INFO) */
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- gdb/remote.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gdb/remote.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -64,7 +64,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "macosx-nat-dyld.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "macosx-nat-dyld-process.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAVE_EXECINFO_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <execinfo.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Prototypes for local functions. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void cleanup_sigint_signal_handler (void *dummy);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -478,11 +481,13 @@ struct memory_packet_config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- remote_backtrace_self (const char *message)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if (MAC_OS_X_VERSION_MIN_REQUIRED >= 1050)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void *bt_buffer[100];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int count = backtrace (bt_buffer, 100);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (message && message[0])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fprintf_filtered (gdb_stderr, "%s", message);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- backtrace_symbols_fd (bt_buffer, count, STDERR_FILENO);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</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;'>- static void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gdb/utils.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gdb/utils.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28,7 +28,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "event-top.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "exceptions.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "bfd.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAVE_EXECINFO_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <execinfo.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/resource.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <uuid/uuid.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <regex.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -882,12 +885,14 @@ internal_vproblem (struct internal_problem *problem,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* APPLE LOCAL: Do a stack crawl of how we got here so we're more likely
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- to get useful bug reports. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if (MAC_OS_X_VERSION_MIN_REQUIRED >= 1050)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void *bt_buffer[15];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int count = backtrace (bt_buffer, 15);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fprintf (stderr, "gdb stack crawl at point of internal error:\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- backtrace_symbols_fd (bt_buffer, count, STDERR_FILENO);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Create a string containing the full error/warning message. Need
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- to call query with this full string, as otherwize the reason
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gdb-apple/files/patch-macosx-tdep.c.diff b/devel/gdb-apple/files/patch-macosx-tdep.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index dc8c7369752..4b91e4fbb17 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gdb-apple/files/patch-macosx-tdep.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gdb-apple/files/patch-macosx-tdep.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fixes duplicate symbol error linking on 10.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> Fixes compilation targeting 10.4 and 10.5
--- gdb/macosx/macosx-tdep.c.orig
+++ gdb/macosx/macosx-tdep.c
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -160,7 +160,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define BFD_GETL32(addr) ((((((uint32_t) addr[3] << 8) | addr[2]) << 8) | addr[1]) << 8 | addr[0])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define BFD_GETL64(addr) ((((((((((uint64_t) addr[7] << 8) | addr[6]) << 8) | addr[5]) << 8 | addr[4]) << 8 | addr[3]) << 8 | addr[2]) << 8 | addr[1]) << 8 | addr[0])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-unsigned char macosx_symbol_types[256];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static unsigned char macosx_symbol_types[256];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static unsigned char
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macosx_symbol_type_base (macho_type)
</span> @@ -1558,7 +1558,11 @@
if (plist_data == NULL)
return NULL;
</pre><pre style='margin:0'>
</pre>