<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f743b6264a4d03bc5d0dfb0f7271f297df1cf163">https://github.com/macports/macports-ports/commit/f743b6264a4d03bc5d0dfb0f7271f297df1cf163</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 f743b6264a4 llvm-{devel,14}: Synchronise some diffs between the two portfiles
</span>f743b6264a4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f743b6264a4d03bc5d0dfb0f7271f297df1cf163
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Fri Jul 8 14:00:37 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> llvm-{devel,14}: Synchronise some diffs between the two portfiles
</span>---
lang/llvm-14/Portfile | 14 ++++++--------
lang/llvm-devel/Portfile | 47 ++++++++++++++++++++++++++++-------------------
2 files changed, 34 insertions(+), 27 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 ff51ab7e89b..6c5f4aaf1ee 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;'>@@ -22,6 +22,7 @@ license NCSA
</span> maintainers nomaintainer
set llvm_version 14
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set clang_exe_version ${llvm_version}
</span> version ${llvm_version}.0.6
name llvm-${llvm_version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,7 +47,7 @@ worksrcdir ${worksrcdir}/llvm
</span>
# hand-tweaked, approximately c++ standard 2017
compiler.blacklist *gcc* {clang < 1001} macports-clang-3.*
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# clang-13/work/build/include/c++/v1/optional:224:5: error: destructor cannot be marked constexpr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# work/build/include/c++/v1/optional:224:5: error: destructor cannot be marked constexpr
</span> # _LIBCPP_CONSTEXPR_AFTER_CXX17 ~__optional_destruct_base()
compiler.blacklist-append {clang < 1204} {macports-clang-[5-9].0}
compiler.fallback clang macports-clang-11 macports-clang-10
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -103,9 +104,8 @@ 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;'>+ 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:#e0e0e0;'>@@ -247,8 +247,6 @@ if { ${subport} eq "clang-${llvm_version}" } {
</span> -DLIBCXX_ENABLE_SHARED=ON \
-DLIBCXX_INSTALL_LIBRARY=ON
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #-DLLVM_ENABLE_RUNTIMES="libcxx\;libcxxabi"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> destroot {
# we have to run the destroot like this, because individual targets for each of the
# components we want to install are not available; we want "everything but llvm"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -416,7 +414,7 @@ post-destroot {
</span> if {${subport} eq "clang-${llvm_version}"} {
# remove the clang symlink and replace it with the actual binary
delete ${destroot}${sub_prefix}/bin/clang
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename ${destroot}${sub_prefix}/bin/clang-${llvm_version} ${destroot}${sub_prefix}/bin/clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file rename ${destroot}${sub_prefix}/bin/clang-${clang_exe_version} ${destroot}${sub_prefix}/bin/clang
</span> }
# generate a versioned wrapper script for each file in the bin directory
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -446,7 +444,7 @@ post-destroot {
</span>
if {${subport} eq "clang-${llvm_version}"} {
# fix the cmake scripts to point to the versioned files
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|/bin/clang-${llvm_version}|/bin/clang|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|/bin/clang-${clang_exe_version}|/bin/clang|g" \
</span> "${destroot}${sub_prefix}/lib/cmake/clang/ClangTargets-release.cmake"
# http://trac.macports.org/ticket/33207
<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 6a2f2652586..e6981fbaa00 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;'>@@ -94,6 +94,11 @@ configure.args-append \
</span> -DFFI_INCLUDE_DIR=${prefix}/include \
-DFFI_LIBRARY_DIR=${prefix}/lib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Disable iOS support on older systems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} <= 12} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DCOMPILER_RT_ENABLE_IOS=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # cctools is needed to handle objects from newer clang toolchains
if {[string match macports-clang-* ${configure.compiler}]} {
depends_build-append port:cctools
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -116,7 +121,6 @@ platform darwin {
</span> configure.cxx_stdlib libc++
depends_lib-append port:libcxx
if {${os.major} < 11} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #supported_archs i386 x86_64
</span> pre-fetch {
if {![file exists /usr/lib/libc++.dylib]} {
ui_error "$name requires a C++11 runtime, which your configuration does not allow"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -174,7 +178,11 @@ if {${os.platform} eq "darwin" && ${os.major} < 10} {
</span> if {${os.platform} eq "darwin" && ${os.major} < 16} {
# error: 'TARGET_OS_OSX' is not defined, evaluates to 0 [-Werror,-Wundef-prefix=TARGET_OS_]
patchfiles-append 0100-define-target-os-osx.patch
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # error: use of undeclared identifier 'clonefile'
</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;'>+if {${os.platform} eq "darwin" && ${os.major} < 16} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Avoid attempts to use 'clonefile'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # llvm/lib/Support/Unix/Path.inc:1476:10: error: use of undeclared identifier 'clonefile'
</span> patchfiles-append 0200-remove-use-of-clonefile.patch
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -329,13 +337,13 @@ if { ${subport} eq "clang-${llvm_version}" || ${subport} eq "flang-${llvm_versio
</span> -DDARWIN_PREFER_PUBLIC_SDK=ON \
-DLLVM_BUILD_RUNTIME=ON
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} <= 18} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && ${os.major} <= 18} {
</span> # on systems that might build i386, we need atomic builtins
# https://trac.macports.org/ticket/58712
configure.args-append -DCOMPILER_RT_EXCLUDE_ATOMIC_BUILTIN=OFF
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} <= 14} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && ${os.major} <= 14} {
</span> # compiler-rt does a broad search for an SDK it likes, but this
# search fails on older systems that don't have a MacOSX.sdk
# TODO: apply this always to all systems?
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -350,22 +358,17 @@ if { ${subport} eq "clang-${llvm_version}" || ${subport} eq "flang-${llvm_versio
</span> -DCOMPILER_RT_BUILD_MEMPROF=OFF
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} <= 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && ${os.major} <= 11} {
</span> # xpc.h available 10.7 but doesn't support nullable features
configure.args-append -DCLANGD_BUILD_XPC=OFF
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} <= 10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && ${os.major} <= 10} {
</span> # avoid need for thread_local_storage
configure.args-append -DCLANG_ENABLE_CLANGD=OFF \
-DLLVM_ENABLE_BACKTRACES=OFF
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} <= 12} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Make sure iOS support is disabled ...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DCOMPILER_RT_ENABLE_IOS=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> }
if {${subport} eq "lldb-${llvm_version}"} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -398,18 +401,17 @@ if {${subport} eq "lldb-${llvm_version}"} {
</span>
set worksrcpath ${workpath}/${distname}/lldb
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-activate {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "Please follow the instructions at https://lldb.llvm.org/resources/build.html#code-signing-on-macos and then codesign lldb-server with:"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} >= 13} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg " sudo codesign --force --deep --preserve-metadata=identifier,entitlements,resource-rules,requirements,flags,team-identifier --sign <identity> ${sub_prefix}/bin/lldb-server"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg " sudo codesign --force --deep --preserve-metadata=identifier,entitlements,resource-rules,requirements --sign <identity> ${sub_prefix}/bin/lldb-server"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes "Please follow the instructions at https://lldb.llvm.org/resources/build.html#code-signing-on-macos and then codesign lldb-server with:\n--------------------\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes-append "sudo ${sub_prefix}/scripts/lldb/macos-setup-codesign.sh"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} >= 13} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes-append "sudo codesign --force --deep --preserve-metadata=identifier,entitlements,resource-rules,requirements,flags,team-identifier --sign lldb_codesign ${sub_prefix}/bin/lldb-server"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes-append "sudo codesign --force --deep --preserve-metadata=identifier,entitlements,resource-rules,requirements --sign lldb_codesign ${sub_prefix}/bin/lldb-server"
</span> }
}
variant tests description {Enable building of test code} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_test-append port:py39-psutil
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_test-append port:py${py_ver_nodot}-psutil
</span> test.run yes
configure.args-append -DLLVM_INCLUDE_TESTS=ON
test.target check
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -470,6 +472,13 @@ post-destroot {
</span>
if {${subport} eq "lldb-${llvm_version}"} {
delete ${destroot}${prefix}/bin/debugserver-${suffix}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set lldb_scripts_srcdir ${worksrcpath}/scripts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set lldb_scripts_destdir ${destroot}${sub_prefix}/scripts/lldb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${lldb_scripts_destdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -W ${lldb_scripts_srcdir} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macos-setup-codesign.sh \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${lldb_scripts_destdir}
</span> }
}
</pre><pre style='margin:0'>
</pre>