<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/2833f15e27bda716f05bb5f2e29a4c2d8deddf53">https://github.com/macports/macports-ports/commit/2833f15e27bda716f05bb5f2e29a4c2d8deddf53</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 2833f15e27bda716f05bb5f2e29a4c2d8deddf53
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu Jan 13 17:34:01 2022 +1100
<span style='display:block; white-space:pre;color:#404040;'> llvm-devel: set supported_archs
</span>---
lang/llvm-devel/Portfile | 30 ++++++++++--------------------
1 file changed, 10 insertions(+), 20 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/Portfile b/lang/llvm-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 879168c6075..c611fc21216 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -112,15 +112,22 @@ configure.args-append -DPython3_EXECUTABLE=${pythonfullpath}
</span> platform darwin {
configure.cxx_stdlib libc++
depends_lib-append port:libcxx
<span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- supported_archs i386 x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #supported_archs i386 x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span> if {![file exists /usr/lib/libc++.dylib]} {
ui_error "$name requires a C++11 runtime, which your configuration does not allow"
error "unsupported configuration"
}
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Currently fails on i386:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # llvm/tools/llvm-objcopy/MachO/MachOWriter.cpp:569:21: error: no matching function for call to 'min'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # std::min(HashReadEnd - CurrHashReadPosition,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ^~~~~~~~
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # /opt/local/libexec/llvm-11/bin/../include/c++/v1/algorithm:2560:1: note: candidate template ignored: deduced conflicting types for parameter '_Tp' ('int' vs. 'long')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # min(const _Tp& __a, const _Tp& __b)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ supported_archs arm64 x86_64
</span> }
patch.pre_args -p1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -305,23 +312,6 @@ if { ${subport} eq "clang-${llvm_version}" ||
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${build_arch} eq "i386"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # llvm/tools/llvm-objcopy/MachO/MachOWriter.cpp:569:21: error: no matching function for call to 'min'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # std::min(HashReadEnd - CurrHashReadPosition,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ^~~~~~~~
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # /opt/local/libexec/llvm-11/bin/../include/c++/v1/algorithm:2560:1: note: candidate template ignored: deduced conflicting types for parameter '_Tp' ('int' vs. 'long')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # min(const _Tp& __a, const _Tp& __b)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- archive_sites
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Can't set known_fail based on build_arch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${subport} currently fails to build on the $build_arch architecture."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error {unsupported architecture}
</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;'>-
</span> if { ${subport} eq "clang-${llvm_version}" || ${subport} eq "flang-${llvm_version}" } {
depends_lib-append port:libxml2 port:libomp port:llvm-${llvm_version} port:mlir-${llvm_version}
</pre><pre style='margin:0'>
</pre>