<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/f0e88ce85c41483c58bf21e5ab7288323341731f">https://github.com/macports/macports-ports/commit/f0e88ce85c41483c58bf21e5ab7288323341731f</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f0e88ce85c41483c58bf21e5ab7288323341731f
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Sun Aug 13 15:31:21 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> clang-{11..16}: fix build on macOS 10.5
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> [skip ci]
</span>---
lang/llvm-11/Portfile | 8 ++++
lang/llvm-11/files/leopard-link-against-gcc_s.diff | 25 +++++++++++++
lang/llvm-12/Portfile | 6 +--
...-libcxx-link-gcc_s.1-on-macOS-before-10.6.patch | 43 ++++++++++++++++++++++
lang/llvm-13/Portfile | 6 +--
...-libcxx-link-gcc_s.1-on-macOS-before-10.6.patch | 43 ++++++++++++++++++++++
lang/llvm-14/Portfile | 7 ++--
...-libcxx-link-gcc_s.1-on-macOS-before-10.6.patch | 43 ++++++++++++++++++++++
lang/llvm-15/Portfile | 7 +---
...-libcxx-link-gcc_s.1-on-macOS-before-10.6.patch | 43 ++++++++++++++++++++++
lang/llvm-16/Portfile | 12 ++++--
...-libcxx-link-gcc_s.1-on-macOS-before-10.6.patch | 43 ++++++++++++++++++++++
...use-malloc-free-only-on-macOS-before-10.6.patch | 31 ++++++++++++++++
...572d484a2b5dc356f59050bb173c8c77c-inverse.patch | 11 ++++++
14 files changed, 308 insertions(+), 20 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-11/Portfile b/lang/llvm-11/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fbe177f2347..d0be21018dd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-11/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-11/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -375,6 +375,14 @@ platform darwin {
</span> # TO DO: the blocks functionality can be replaced by libblocksruntime
# this might be integrated into clang on < 10.6
patchfiles-append leopard-no-blocks.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Building Xray forces build of sanitizer_common, even if
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # COMPILER_RT_BUILD_SANITIZERS=OFF, and this fails on 10.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # due to lack of pthread_getname_np
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DCOMPILER_RT_BUILD_XRAY=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # on Leopard part of symbols like __udivdi3 in -lgcc_s.1 instead of -lSystem
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append leopard-link-against-gcc_s.diff
</span> }
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-11/files/leopard-link-against-gcc_s.diff b/lang/llvm-11/files/leopard-link-against-gcc_s.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c3cd16d757b
</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-11/files/leopard-link-against-gcc_s.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./projects/libcxx/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./projects/libcxx/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -738,6 +738,10 @@ function(cxx_link_system_libraries target)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(${target} PRIVATE System)
</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;'>++ if (APPLE AND CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS 10.6)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_link_libraries(${target} PRIVATE gcc_s.1)
</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;'>+ if (LIBCXX_HAS_PTHREAD_LIB)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(${target} PRIVATE pthread)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./projects/libcxxabi/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./projects/libcxxabi/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -65,6 +65,9 @@ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_library_flags_if(LIBCXXABI_HAS_SYSTEM_LIB System)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS 10.6)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add_library_flags(gcc_s.1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (LIBCXXABI_ENABLE_THREADS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_library_flags_if(LIBCXXABI_HAS_PTHREAD_LIB pthread)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-12/Portfile b/lang/llvm-12/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e696514b27f..41178dbece9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-12/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-12/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -138,7 +138,8 @@ if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span> if {${os.platform} eq "darwin" && ${os.major} < 10} {
patchfiles-append \
0022-10.5-and-less-default-to-fno-blocks.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0024-10.5-and-less-compiler-rt-work-around-no-libdispatch.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0024-10.5-and-less-compiler-rt-work-around-no-libdispatch.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0027-libcxx-link-gcc_s.1-on-macOS-before-10.6.patch
</span> }
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -197,9 +198,6 @@ if {${subport} eq "clang-${llvm_version}"} {
</span> select.group clang
select.file ${filespath}/mp-${subport}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # temporarily restrict to newer systems until older systems can be rigorously vetted
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- platforms {darwin >= 10}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # CMAKE_LINKER is used to determine the value for HOST_LINK_VERSION
configure.args-append \
-DCMAKE_LINKER=${prefix}/bin/ld \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-12/files/0027-libcxx-link-gcc_s.1-on-macOS-before-10.6.patch b/lang/llvm-12/files/0027-libcxx-link-gcc_s.1-on-macOS-before-10.6.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4cae58caee5
</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-12/files/0027-libcxx-link-gcc_s.1-on-macOS-before-10.6.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,43 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From af86bd2ceeaebaa2c96e2f608d74df678479ba45 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: "Kirill A. Korinsky" <kirill@korins.ky>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 7 Aug 2023 12:05:37 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] [libcxx] link gcc_s.1 on macOS before 10.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+leopard and before has some symbols at libgcc_s.1 instead of libSystem.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libcxx/CMakeLists.txt | 4 ++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libcxxabi/src/CMakeLists.txt | 3 +++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 7 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 910d04b54b6d..d1408b4a58c5 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/libcxx/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libcxx/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -738,6 +738,10 @@ function(cxx_link_system_libraries target)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(${target} PRIVATE System)
</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;'>++ if (APPLE AND CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS 10.6)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_link_libraries(${target} PRIVATE gcc_s.1)
</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;'>+ if (LIBCXX_HAS_PTHREAD_LIB)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(${target} PRIVATE pthread)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/libcxxabi/src/CMakeLists.txt b/libcxxabi/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 42bec421d2be..b85bbc8053a4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/libcxxabi/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libcxxabi/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -65,6 +65,9 @@ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_library_flags_if(LIBCXXABI_HAS_SYSTEM_LIB System)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS 10.6)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add_library_flags(gcc_s.1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (LIBCXXABI_ENABLE_THREADS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_library_flags_if(LIBCXXABI_HAS_PTHREAD_LIB pthread)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.41.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-13/Portfile b/lang/llvm-13/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0b2e8f997b6..623dc1e0023 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-13/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-13/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,7 +146,8 @@ if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span> if {${os.platform} eq "darwin" && ${os.major} < 10} {
patchfiles-append \
0022-10.5-and-less-default-to-fno-blocks.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0024-10.5-and-less-compiler-rt-work-around-no-libdispatch.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0024-10.5-and-less-compiler-rt-work-around-no-libdispatch.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0027-libcxx-link-gcc_s.1-on-macOS-before-10.6.patch
</span> }
if {${os.platform} eq "darwin" && ${os.major} < 16} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -279,8 +280,7 @@ if { ${subport} eq "flang-${llvm_version}" } {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${subport} eq "clang-${llvm_version}" ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${subport} eq "mlir-${llvm_version}" ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${subport} eq "mlir-${llvm_version}" ||
</span> ${subport} eq "flang-${llvm_version}" } {
# temporarily restrict to newer systems until older systems can be rigorously vetted
platforms {darwin >= 10}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-13/files/0027-libcxx-link-gcc_s.1-on-macOS-before-10.6.patch b/lang/llvm-13/files/0027-libcxx-link-gcc_s.1-on-macOS-before-10.6.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4cae58caee5
</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-13/files/0027-libcxx-link-gcc_s.1-on-macOS-before-10.6.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,43 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From af86bd2ceeaebaa2c96e2f608d74df678479ba45 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: "Kirill A. Korinsky" <kirill@korins.ky>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 7 Aug 2023 12:05:37 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] [libcxx] link gcc_s.1 on macOS before 10.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+leopard and before has some symbols at libgcc_s.1 instead of libSystem.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libcxx/CMakeLists.txt | 4 ++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libcxxabi/src/CMakeLists.txt | 3 +++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 7 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 910d04b54b6d..d1408b4a58c5 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/libcxx/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libcxx/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -738,6 +738,10 @@ function(cxx_link_system_libraries target)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(${target} PRIVATE System)
</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;'>++ if (APPLE AND CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS 10.6)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_link_libraries(${target} PRIVATE gcc_s.1)
</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;'>+ if (LIBCXX_HAS_PTHREAD_LIB)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(${target} PRIVATE pthread)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/libcxxabi/src/CMakeLists.txt b/libcxxabi/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 42bec421d2be..b85bbc8053a4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/libcxxabi/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libcxxabi/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -65,6 +65,9 @@ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_library_flags_if(LIBCXXABI_HAS_SYSTEM_LIB System)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS 10.6)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add_library_flags(gcc_s.1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (LIBCXXABI_ENABLE_THREADS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_library_flags_if(LIBCXXABI_HAS_PTHREAD_LIB pthread)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.41.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><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 6f937fbacf5..c968b12e7f8 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;'>@@ -152,7 +152,8 @@ if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span> if {${os.platform} eq "darwin" && ${os.major} < 10} {
patchfiles-append \
0022-10.5-and-less-default-to-fno-blocks.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0024-10.5-and-less-compiler-rt-work-around-no-libdispatch.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0024-10.5-and-less-compiler-rt-work-around-no-libdispatch.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0027-libcxx-link-gcc_s.1-on-macOS-before-10.6.patch
</span> }
if {${os.platform} eq "darwin" && ${os.major} < 16} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -284,8 +285,7 @@ if { ${subport} eq "flang-${llvm_version}" } {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${subport} eq "clang-${llvm_version}" ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${subport} eq "mlir-${llvm_version}" ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${subport} eq "mlir-${llvm_version}" ||
</span> ${subport} eq "flang-${llvm_version}" } {
# temporarily restrict to newer systems until older systems can be rigorously vetted
platforms {darwin >= 10}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -339,7 +339,6 @@ if { ${subport} eq "clang-${llvm_version}" || ${subport} eq "flang-${llvm_versio
</span> configure.args-append -DCLANG_ENABLE_CLANGD=OFF \
-DLLVM_ENABLE_BACKTRACES=OFF
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> }
if {${subport} eq "lldb-${llvm_version}"} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-14/files/0027-libcxx-link-gcc_s.1-on-macOS-before-10.6.patch b/lang/llvm-14/files/0027-libcxx-link-gcc_s.1-on-macOS-before-10.6.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4cae58caee5
</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/0027-libcxx-link-gcc_s.1-on-macOS-before-10.6.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,43 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From af86bd2ceeaebaa2c96e2f608d74df678479ba45 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: "Kirill A. Korinsky" <kirill@korins.ky>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 7 Aug 2023 12:05:37 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] [libcxx] link gcc_s.1 on macOS before 10.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+leopard and before has some symbols at libgcc_s.1 instead of libSystem.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libcxx/CMakeLists.txt | 4 ++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libcxxabi/src/CMakeLists.txt | 3 +++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 7 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 910d04b54b6d..d1408b4a58c5 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/libcxx/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libcxx/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -738,6 +738,10 @@ function(cxx_link_system_libraries target)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(${target} PRIVATE System)
</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;'>++ if (APPLE AND CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS 10.6)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_link_libraries(${target} PRIVATE gcc_s.1)
</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;'>+ if (LIBCXX_HAS_PTHREAD_LIB)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(${target} PRIVATE pthread)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/libcxxabi/src/CMakeLists.txt b/libcxxabi/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 42bec421d2be..b85bbc8053a4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/libcxxabi/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libcxxabi/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -65,6 +65,9 @@ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_library_flags_if(LIBCXXABI_HAS_SYSTEM_LIB System)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS 10.6)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add_library_flags(gcc_s.1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (LIBCXXABI_ENABLE_THREADS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_library_flags_if(LIBCXXABI_HAS_PTHREAD_LIB pthread)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.41.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-15/Portfile b/lang/llvm-15/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 38c2c370895..b5b76d5255e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-15/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-15/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -159,7 +159,8 @@ if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span> if {${os.platform} eq "darwin" && ${os.major} < 10} {
patchfiles-append \
0022-10.5-and-less-default-to-fno-blocks.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0024-10.5-and-less-compiler-rt-work-around-no-libdispatch.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0024-10.5-and-less-compiler-rt-work-around-no-libdispatch.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0027-libcxx-link-gcc_s.1-on-macOS-before-10.6.patch
</span> }
if {${os.platform} eq "darwin" && ${os.major} < 16} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -300,9 +301,6 @@ if { ${subport} eq "flang-${llvm_version}" } {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Restrict to 10.6 and newer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms {darwin >= 10}
</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}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -356,7 +354,6 @@ if { ${subport} eq "clang-${llvm_version}" || ${subport} eq "flang-${llvm_versio
</span> configure.args-append -DCLANG_ENABLE_CLANGD=OFF \
-DLLVM_ENABLE_BACKTRACES=OFF
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> }
if {${subport} eq "lldb-${llvm_version}"} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-15/files/0027-libcxx-link-gcc_s.1-on-macOS-before-10.6.patch b/lang/llvm-15/files/0027-libcxx-link-gcc_s.1-on-macOS-before-10.6.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4cae58caee5
</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-15/files/0027-libcxx-link-gcc_s.1-on-macOS-before-10.6.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,43 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From af86bd2ceeaebaa2c96e2f608d74df678479ba45 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: "Kirill A. Korinsky" <kirill@korins.ky>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 7 Aug 2023 12:05:37 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] [libcxx] link gcc_s.1 on macOS before 10.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+leopard and before has some symbols at libgcc_s.1 instead of libSystem.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libcxx/CMakeLists.txt | 4 ++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libcxxabi/src/CMakeLists.txt | 3 +++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 7 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 910d04b54b6d..d1408b4a58c5 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/libcxx/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libcxx/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -738,6 +738,10 @@ function(cxx_link_system_libraries target)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(${target} PRIVATE System)
</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;'>++ if (APPLE AND CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS 10.6)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_link_libraries(${target} PRIVATE gcc_s.1)
</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;'>+ if (LIBCXX_HAS_PTHREAD_LIB)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(${target} PRIVATE pthread)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/libcxxabi/src/CMakeLists.txt b/libcxxabi/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 42bec421d2be..b85bbc8053a4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/libcxxabi/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libcxxabi/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -65,6 +65,9 @@ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_library_flags_if(LIBCXXABI_HAS_SYSTEM_LIB System)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS 10.6)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add_library_flags(gcc_s.1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (LIBCXXABI_ENABLE_THREADS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_library_flags_if(LIBCXXABI_HAS_PTHREAD_LIB pthread)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.41.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-16/Portfile b/lang/llvm-16/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f0c7d7ec11c..4d293492277 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-16/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-16/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -159,7 +159,14 @@ if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span> if {${os.platform} eq "darwin" && ${os.major} < 10} {
patchfiles-append \
0022-10.5-and-less-default-to-fno-blocks.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0024-10.5-and-less-compiler-rt-work-around-no-libdispatch.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0024-10.5-and-less-compiler-rt-work-around-no-libdispatch.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0027-libcxx-link-gcc_s.1-on-macOS-before-10.6.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0028-libcxx-use-malloc-free-only-on-macOS-before-10.6.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # inverse limit of building for macOS 10.7+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See: https://github.com/llvm/llvm-project/commit/49d2071572d484a2b5dc356f59050bb173c8c77c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 49d2071572d484a2b5dc356f59050bb173c8c77c-inverse.patch
</span> }
if {${os.platform} eq "darwin" && ${os.major} < 16} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -313,9 +320,6 @@ if { ${subport} eq "flang-${llvm_version}" } {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Restrict to 10.6 and newer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms {darwin >= 10}
</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}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-16/files/0027-libcxx-link-gcc_s.1-on-macOS-before-10.6.patch b/lang/llvm-16/files/0027-libcxx-link-gcc_s.1-on-macOS-before-10.6.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4cae58caee5
</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-16/files/0027-libcxx-link-gcc_s.1-on-macOS-before-10.6.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,43 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From af86bd2ceeaebaa2c96e2f608d74df678479ba45 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: "Kirill A. Korinsky" <kirill@korins.ky>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 7 Aug 2023 12:05:37 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] [libcxx] link gcc_s.1 on macOS before 10.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+leopard and before has some symbols at libgcc_s.1 instead of libSystem.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libcxx/CMakeLists.txt | 4 ++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libcxxabi/src/CMakeLists.txt | 3 +++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 7 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 910d04b54b6d..d1408b4a58c5 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/libcxx/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libcxx/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -738,6 +738,10 @@ function(cxx_link_system_libraries target)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(${target} PRIVATE System)
</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;'>++ if (APPLE AND CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS 10.6)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_link_libraries(${target} PRIVATE gcc_s.1)
</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;'>+ if (LIBCXX_HAS_PTHREAD_LIB)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(${target} PRIVATE pthread)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/libcxxabi/src/CMakeLists.txt b/libcxxabi/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 42bec421d2be..b85bbc8053a4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/libcxxabi/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libcxxabi/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -65,6 +65,9 @@ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_library_flags_if(LIBCXXABI_HAS_SYSTEM_LIB System)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS 10.6)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add_library_flags(gcc_s.1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (LIBCXXABI_ENABLE_THREADS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_library_flags_if(LIBCXXABI_HAS_PTHREAD_LIB pthread)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.41.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-16/files/0028-libcxx-use-malloc-free-only-on-macOS-before-10.6.patch b/lang/llvm-16/files/0028-libcxx-use-malloc-free-only-on-macOS-before-10.6.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..102257963ad
</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-16/files/0028-libcxx-use-malloc-free-only-on-macOS-before-10.6.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,31 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 438ce8c5bcc4f6d579c1a59bfd209e09862c1beb Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: "Kirill A. Korinsky" <kirill@korins.ky>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 7 Aug 2023 15:52:29 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] [libcxx] use malloc/free only on macOS before 10.6
</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;'>+ libcxx/include/new | 5 +++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 5 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/libcxx/include/new b/libcxx/include/new
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0c826f4a061c..6a3a787e65f5 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/libcxx/include/new
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libcxx/include/new
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -355,9 +355,14 @@ inline _LIBCPP_INLINE_VISIBILITY void* __libcpp_aligned_alloc(std::size_t __alig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ::aligned_alloc(__alignment, __size > __rounded_size ? __size : __rounded_size);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void* __result = nullptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if defined(__APPLE__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (void)::posix_memalign(&__result, __alignment, __size);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // If posix_memalign fails, __result is unmodified so we still return `nullptr`.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return __result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // macOS before 10.6 hasn't got alligned malloc, fallback to just malloc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return ::malloc(__size);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif
</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;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.41.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-16/files/49d2071572d484a2b5dc356f59050bb173c8c77c-inverse.patch b/lang/llvm-16/files/49d2071572d484a2b5dc356f59050bb173c8c77c-inverse.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3b7954c05f9
</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-16/files/49d2071572d484a2b5dc356f59050bb173c8c77c-inverse.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/compiler-rt/cmake/builtin-config-ix.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/compiler-rt/cmake/builtin-config-ix.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -97,7 +97,7 @@ if(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endfunction()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(DARWIN_EMBEDDED_PLATFORMS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(DARWIN_osx_BUILTIN_MIN_VER 10.7)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(DARWIN_osx_BUILTIN_MIN_VER 10.5)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(DARWIN_osx_BUILTIN_MIN_VER_FLAG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -mmacosx-version-min=${DARWIN_osx_BUILTIN_MIN_VER})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(DARWIN_osx_BUILTIN_ALL_POSSIBLE_ARCHS ${X86} ${X86_64})
</span></pre><pre style='margin:0'>
</pre>