<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2fda12633ba31941b1d1f44210b525de2c135d9e">https://github.com/macports/macports-ports/commit/2fda12633ba31941b1d1f44210b525de2c135d9e</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 2fda12633ba clang-14: attempt to fix i386 build
</span>2fda12633ba is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2fda12633ba31941b1d1f44210b525de2c135d9e
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Jul 2 20:10:52 2022 +1000
<span style='display:block; white-space:pre;color:#404040;'> clang-14: attempt to fix i386 build
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/65423
</span>---
lang/llvm-14/Portfile | 3 ++-
lang/llvm-14/files/MachOWriter.cpp-types.patch | 12 +++++++-----
lang/llvm-14/files/SyntheticSections.cpp-types.patch | 12 ++++++++++++
3 files changed, 21 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-14/Portfile b/lang/llvm-14/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bb944482cf6..ff51ab7e89b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-14/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-14/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -134,7 +134,8 @@ patchfiles-append \
</span> 0015-Fixup-libstdc-header-search-paths-for-older-versions.patch \
0019-10.6-and-less-use-emulated-TLS-before-10.7.patch \
0025-lldb-add-defines-needed-for-older-SDKs.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- MachOWriter.cpp-types.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MachOWriter.cpp-types.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SyntheticSections.cpp-types.patch
</span>
if {${os.platform} eq "darwin" && ${os.major} < 14} {
patchfiles-append \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-14/files/MachOWriter.cpp-types.patch b/lang/llvm-14/files/MachOWriter.cpp-types.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 8d5b43e2f28..e2b71c7add8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-14/files/MachOWriter.cpp-types.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-14/files/MachOWriter.cpp-types.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,16 @@
</span> The result of pointer arithmetic is of type ptrdiff_t, which is not
necessarily the same underlying type as ssize_t.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/llvm/tools/llvm-objcopy/MachO/MachOWriter.cpp 2022-06-11 00:47:36.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/llvm/tools/llvm-objcopy/MachO/MachOWriter.cpp 2022-06-16 23:41:23.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -566,7 +566,7 @@ void MachOWriter::writeCodeSignatureData
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm-project-14.0.6.src/llvm/tools/llvm-objcopy/MachO/MachOWriter.cpp.orig 2022-06-23 02:46:24.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ llvm-project-14.0.6.src/llvm/tools/llvm-objcopy/MachO/MachOWriter.cpp 2022-07-02 20:05:12.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -566,8 +566,8 @@ void MachOWriter::writeCodeSignatureData
</span> uint8_t *CurrHashWritePosition = HashWriteStart;
while (CurrHashReadPosition < HashReadEnd) {
StringRef Block(reinterpret_cast<char *>(CurrHashReadPosition),
- std::min(HashReadEnd - CurrHashReadPosition,
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ std::min(static_cast<ssize_t>(HashReadEnd - CurrHashReadPosition),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static_cast<ssize_t>(CodeSignature.BlockSize)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static_cast<ssize_t>(CodeSignature.BlockSize)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ std::min(static_cast<size_t>(HashReadEnd - CurrHashReadPosition),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static_cast<size_t>(CodeSignature.BlockSize)));
</span> SHA256 Hasher;
Hasher.update(Block);
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ StringRef Hash = Hasher.final();
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-14/files/SyntheticSections.cpp-types.patch b/lang/llvm-14/files/SyntheticSections.cpp-types.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..da9f9399781
</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-14/files/SyntheticSections.cpp-types.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm-project-14.0.6.src/lld/MachO/SyntheticSections.cpp.orig 2022-06-23 02:46:24.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ llvm-project-14.0.6.src/lld/MachO/SyntheticSections.cpp 2022-07-02 20:06:18.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1190,7 +1190,8 @@ void CodeSignatureSection::writeHashes(u
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint8_t *hashes = codeEnd + allHeadersSize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while (code < codeEnd) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ StringRef block(reinterpret_cast<char *>(code),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- std::min(codeEnd - code, static_cast<ssize_t>(blockSize)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ std::min(static_cast<size_t>(codeEnd - code),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static_cast<size_t>(blockSize)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SHA256 hasher;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hasher.update(block);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ StringRef hash = hasher.final();
</span></pre><pre style='margin:0'>
</pre>