<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/536919b80849052fcb0f3adec9ceae983c5ac4e5">https://github.com/macports/macports-ports/commit/536919b80849052fcb0f3adec9ceae983c5ac4e5</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 536919b8084 lldb-10: patch for ARM build failure - Note that fix applies to x86_64 as well Fixes: https://trac.macports.org/ticket/65355
</span>536919b8084 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 536919b80849052fcb0f3adec9ceae983c5ac4e5
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Fri Jun 17 12:46:41 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> lldb-10: patch for ARM build failure
</span><span style='display:block; white-space:pre;color:#404040;'> - Note that fix applies to x86_64 as well
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/65355
</span>---
lang/llvm-10/Portfile | 5 ++--
.../patch-lldb-ObjectFileMachO.cpp-iterator.diff | 27 ++++++++++++++++++++++
2 files changed, 30 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-10/Portfile b/lang/llvm-10/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4440e759ab0..557c9b8d75e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-10/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-10/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@ set lldb_executable_version 10
</span> name llvm-${llvm_version}
revision 3
subport clang-${llvm_version} { revision 6 }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport lldb-${llvm_version} { revision 2 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport lldb-${llvm_version} { revision 3 }
</span> set suffix mp-${llvm_version}
set sub_prefix ${prefix}/libexec/llvm-${llvm_version}
dist_subdir llvm
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -186,7 +186,8 @@ if {${subport} eq "lldb-${llvm_version}"} {
</span> 1006-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch \
1007-Fix-float.h-to-work-on-Snow-Leopard-and-earlier.patch \
openmp-locations.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- clang-driver-support-11.x-target.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ clang-driver-support-11.x-target.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-lldb-ObjectFileMachO.cpp-iterator.diff
</span> }
configure.post_args ../${worksrcdir}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-10/files/patch-lldb-ObjectFileMachO.cpp-iterator.diff b/lang/llvm-10/files/patch-lldb-ObjectFileMachO.cpp-iterator.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ae47dcdc81c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-10/files/patch-lldb-ObjectFileMachO.cpp-iterator.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+[ObjectFileMachO] Fix a build error on embedded.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Commit: https://github.com/llvm/llvm-project/commit/34ee941f6d04454838456f0dc692f4abab5cdd19
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Ticket: https://trac.macports.org/ticket/65355
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/tools/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp 2022-06-17 12:23:51.696814020 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/tools/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp 2022-06-17 12:27:25.311601895 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3503,8 +3503,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ N_FUN_addr_to_sym_idx.equal_range(nlist.n_value);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (range.first != range.second) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool found_it = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for (const auto pos = range.first;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pos != range.second; ++pos) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for (auto pos = range.first; pos != range.second;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ++pos) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (sym[sym_idx].GetMangled().GetName(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lldb::eLanguageTypeUnknown,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Mangled::ePreferMangled) ==
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3548,8 +3548,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nlist.n_value);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (range.first != range.second) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool found_it = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for (const auto pos = range.first;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pos != range.second; ++pos) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for (auto pos = range.first; pos != range.second;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ++pos) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (sym[sym_idx].GetMangled().GetName(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lldb::eLanguageTypeUnknown,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Mangled::ePreferMangled) ==
</span></pre><pre style='margin:0'>
</pre>