From: ecordonnier@snap.com
To: yocto-patches@lists.yoctoproject.org
Cc: Etienne Cordonnier <ecordonnier@snap.com>
Subject: [meta-darwin][PATCH 03/21] clang: regenerate Darwin SDK fixes patch for the wrynose base
Date: Wed, 14 Oct 2026 16:10:24 +0200 [thread overview]
Message-ID: <20261014141209.488034-3-ecordonnier@snap.com> (raw)
In-Reply-To: <20261014141209.488034-1-ecordonnier@snap.com>
From: Etienne Cordonnier <ecordonnier@snap.com>
Rebase 0037-Fixes_for_Darwin_SDKs.patch onto the new llvm-project
source tree pulled in by the wrynose layer bump.
AI-Generated: Composer 2.5
Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
---
.../clang/0037-Fixes_for_Darwin_SDKs.patch | 135 +++++++++---------
1 file changed, 70 insertions(+), 65 deletions(-)
diff --git a/recipes-devtools/clang/clang/0037-Fixes_for_Darwin_SDKs.patch b/recipes-devtools/clang/clang/0037-Fixes_for_Darwin_SDKs.patch
index ba2bf9c..c1b551a 100644
--- a/recipes-devtools/clang/clang/0037-Fixes_for_Darwin_SDKs.patch
+++ b/recipes-devtools/clang/clang/0037-Fixes_for_Darwin_SDKs.patch
@@ -1,83 +1,88 @@
-From cb9b87097803b4444ec9aa52b5054ba88e4da01e Mon Sep 17 00:00:00 2001
-From: Dominik Schnitzer <dominik@snap.com>
-Date: Wed, 27 Apr 2022 11:22:17 +0000
+From a9dce54a18db2f12c6964edf649872ac3b50889a Mon Sep 17 00:00:00 2001
+From: Etienne Cordonnier <ecordonnier@snap.com>
+Date: Fri, 16 Jan 2026 16:11:28 +0100
Subject: [PATCH] Fixes for Darwin SDKs
Upstream-Status: Inappropriate [OE specific]
Signed-off-by: Dominik Schnitzer <dominik@snap.com>
-Index: llvm-project-18.1.5.src/clang/lib/Driver/ToolChains/Darwin.cpp
-===================================================================
---- llvm-project-18.1.5.src.orig/clang/lib/Driver/ToolChains/Darwin.cpp
-+++ llvm-project-18.1.5.src/clang/lib/Driver/ToolChains/Darwin.cpp
-@@ -2583,12 +2583,19 @@ void DarwinClang::AddClangCXXStdlibInclu
- case llvm::Triple::x86:
- case llvm::Triple::x86_64:
- IsBaseFound = AddGnuCPlusPlusIncludePaths(DriverArgs, CC1Args, UsrIncludeCxx,
-- "4.2.1",
-- "i686-apple-darwin10",
-- arch == llvm::Triple::x86_64 ? "x86_64" : "");
-+ "13.4.0",
-+ "x86_64#SDK_VENDOR#-darwin21",
-+ "");
- IsBaseFound |= AddGnuCPlusPlusIncludePaths(DriverArgs, CC1Args, UsrIncludeCxx,
-- "4.0.0", "i686-apple-darwin8",
-- "");
-+ "13.4.0", "", "");
-+ {
-+ const char *S = ::getenv("YOCTO_SDKPATH");
-+ if (S && (S[0] != '\0')) {
-+ llvm::SmallString<128> Runtime;
-+ llvm::sys::path::append(Runtime, S);
-+ addSystemInclude(DriverArgs, CC1Args, Runtime);
-+ }
-+ }
- break;
+---
+ clang/lib/Driver/ToolChains/Darwin.cpp | 28 +++++++++++++++++++++-----
+ llvm/cmake/modules/AddLLVM.cmake | 1 -
+ llvm/cmake/modules/CrossCompile.cmake | 2 +-
+ 3 files changed, 24 insertions(+), 7 deletions(-)
+
+diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp b/clang/lib/Driver/ToolChains/Darwin.cpp
+index 234683f2f..9aa9e1036 100644
+--- a/clang/lib/Driver/ToolChains/Darwin.cpp
++++ b/clang/lib/Driver/ToolChains/Darwin.cpp
+@@ -2808,10 +2808,18 @@ void DarwinClang::AddGnuCPlusPlusIncludePaths(
+ case llvm::Triple::x86:
+ case llvm::Triple::x86_64:
+ IsBaseFound = AddGnuCPlusPlusIncludePaths(
+- DriverArgs, CC1Args, UsrIncludeCxx, "4.2.1", "i686-apple-darwin10",
+- arch == llvm::Triple::x86_64 ? "x86_64" : "");
++ DriverArgs, CC1Args, UsrIncludeCxx, "15.3.0", "x86_64#SDK_VENDOR#-darwin21",
++ "");
+ IsBaseFound |= AddGnuCPlusPlusIncludePaths(
+- DriverArgs, CC1Args, UsrIncludeCxx, "4.0.0", "i686-apple-darwin8", "");
++ DriverArgs, CC1Args, UsrIncludeCxx, "15.3.0", "", "");
++ {
++ const char *S = ::getenv("YOCTO_SDKPATH");
++ if (S && (S[0] != '\0')) {
++ llvm::SmallString<128> Runtime;
++ llvm::sys::path::append(Runtime, S);
++ addSystemInclude(DriverArgs, CC1Args, Runtime);
++ }
++ }
+ break;
- case llvm::Triple::arm:
-@@ -2605,9 +2612,19 @@
+ case llvm::Triple::arm:
+@@ -2826,8 +2834,18 @@ void DarwinClang::AddGnuCPlusPlusIncludePaths(
- case llvm::Triple::aarch64:
- IsBaseFound = AddGnuCPlusPlusIncludePaths(DriverArgs, CC1Args, UsrIncludeCxx,
-- "4.2.1",
-- "arm64-apple-darwin10",
-+ "13.4.0",
-+ "aarch64#SDK_VENDOR#-darwin21",
- "");
-+ IsBaseFound |= AddGnuCPlusPlusIncludePaths(DriverArgs, CC1Args, UsrIncludeCxx,
-+ "13.4.0", "", "");
-+ {
-+ const char *S = ::getenv("YOCTO_SDKPATH");
-+ if (S && (S[0] != '\0')) {
-+ llvm::SmallString<128> Runtime;
-+ llvm::sys::path::append(Runtime, S);
-+ addSystemInclude(DriverArgs, CC1Args, Runtime);
-+ }
-+ }
- break;
- }
+ case llvm::Triple::aarch64:
+ IsBaseFound =
+- AddGnuCPlusPlusIncludePaths(DriverArgs, CC1Args, UsrIncludeCxx, "4.2.1",
+- "arm64-apple-darwin10", "");
++ AddGnuCPlusPlusIncludePaths(DriverArgs, CC1Args, UsrIncludeCxx, "15.3.0",
++ "aarch64#SDK_VENDOR#-darwin21", "");
++ IsBaseFound |=
++ AddGnuCPlusPlusIncludePaths(DriverArgs, CC1Args, UsrIncludeCxx, "15.3.0", "", "");
++ {
++ const char *S = ::getenv("YOCTO_SDKPATH");
++ if (S && (S[0] != '\0')) {
++ llvm::SmallString<128> Runtime;
++ llvm::sys::path::append(Runtime, S);
++ addSystemInclude(DriverArgs, CC1Args, Runtime);
++ }
++ }
+ break;
+ }
-Index: llvm-project-18.1.5.src/llvm/cmake/modules/AddLLVM.cmake
-===================================================================
---- llvm-project-18.1.5.src.orig/llvm/cmake/modules/AddLLVM.cmake
-+++ llvm-project-18.1.5.src/llvm/cmake/modules/AddLLVM.cmake
-@@ -2368,7 +2368,6 @@ function(llvm_setup_rpath name)
+diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake
+index 1d184b8d6..bb8e34a66 100644
+--- a/llvm/cmake/modules/AddLLVM.cmake
++++ b/llvm/cmake/modules/AddLLVM.cmake
+@@ -2549,7 +2549,6 @@ function(llvm_setup_rpath name)
endif()
if (APPLE)
- set(_install_name_dir INSTALL_NAME_DIR "@rpath")
set(_install_rpath "@loader_path/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})
- elseif(${CMAKE_SYSTEM_NAME} MATCHES "AIX" AND BUILD_SHARED_LIBS)
+ elseif("${CMAKE_SYSTEM_NAME}" MATCHES "AIX" AND BUILD_SHARED_LIBS)
# $ORIGIN is not interpreted at link time by aix ld.
-Index: llvm-project-18.1.5.src/llvm/cmake/modules/CrossCompile.cmake
-===================================================================
---- llvm-project-18.1.5.src.orig/llvm/cmake/modules/CrossCompile.cmake
-+++ llvm-project-18.1.5.src/llvm/cmake/modules/CrossCompile.cmake
-@@ -72,7 +72,7 @@ function(llvm_create_cross_target projec
+diff --git a/llvm/cmake/modules/CrossCompile.cmake b/llvm/cmake/modules/CrossCompile.cmake
+index 2a69c5133..a6578a763 100644
+--- a/llvm/cmake/modules/CrossCompile.cmake
++++ b/llvm/cmake/modules/CrossCompile.cmake
+@@ -82,7 +82,7 @@ function(llvm_create_cross_target project_name target_name toolchain buildtype)
endif()
add_custom_command(OUTPUT ${${project_name}_${target_name}_BUILD}/CMakeCache.txt
- COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}"
+ COMMAND ${CMAKE_COMMAND} -E env --unset=LDFLAGS --unset=CFLAGS --unset=CXXFLAGS --unset=CC --unset=LD --unset=CXX ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}"
- -DCMAKE_MAKE_PROGRAM="${CMAKE_MAKE_PROGRAM}"
- -DCMAKE_C_COMPILER_LAUNCHER="${CMAKE_C_COMPILER_LAUNCHER}"
- -DCMAKE_CXX_COMPILER_LAUNCHER="${CMAKE_CXX_COMPILER_LAUNCHER}"
+ "-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}"
+ "-DCMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER}"
+ "-DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}"
+--
+2.43.0
+
--
2.43.0
next prev parent reply other threads:[~2026-10-14 14:12 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-14 14:10 [meta-darwin][PATCH 01/21] meta-darwin: bump layer series to wrynose (6.0.3) ecordonnier
2026-10-14 14:10 ` ecordonnier [this message]
2026-10-14 14:10 ` [meta-darwin][PATCH 04/21] automake: drop obsolete Darwin bbappend ecordonnier
2026-10-14 14:10 ` [meta-darwin][PATCH 05/21] zstd: rebase LC_RPATH patch for upstream's new zstdmt guard, scope to darwin21 ecordonnier
2026-10-14 14:10 ` [meta-darwin][PATCH 06/21] darwin recipes: fix S/WORKDIR/destsuffix breakage from git-fetcher UNPACKDIR relocation ecordonnier
2026-10-14 14:10 ` [meta-darwin][PATCH 07/21] cctools-port-crosssdk: fix stale virtual/binutils provider name ecordonnier
2026-10-14 14:10 ` [meta-darwin][PATCH 08/21] libdispatch-native, libtapi-native, cctools-port-crosssdk: fix ineffective clang selection ecordonnier
2026-10-14 14:10 ` [meta-darwin][PATCH 09/21] gcc: fix Darwin ICE from weak-alias __cpu_indicator_init_local ecordonnier
2026-10-14 14:10 ` [meta-darwin][PATCH 10/21] libgcrypt: drop libcap capabilities support for Darwin nativesdk ecordonnier
2026-10-14 14:10 ` [meta-darwin][PATCH 11/21] sqlite3: fix Darwin nativesdk build (SONAME + shell link) ecordonnier
2026-10-14 14:10 ` [meta-darwin][PATCH 12/21] libarchive: drop acl/xattr PACKAGECONFIGs for Darwin nativesdk ecordonnier
2026-10-14 14:10 ` [meta-darwin][PATCH 13/21] clang: scope -femulated-tls/-Wno-elaborated-enum-base to toolchain-clang ecordonnier
2026-10-14 14:10 ` [meta-darwin][PATCH 14/21] clang: disable clangd's XPC transport for the Darwin nativesdk build ecordonnier
2026-10-14 14:10 ` [meta-darwin][PATCH 15/21] clang/lldb: move LLDB support to its own nativesdk-lldb recipe ecordonnier
2026-10-14 14:10 ` [meta-darwin][PATCH 16/21] darwin-common: don't treat buildpaths QA as an error for the SDK ecordonnier
2026-10-14 14:10 ` [meta-darwin][PATCH 17/21] darwin-common: add the nativesdk include dir to the header search path ecordonnier
2026-10-14 14:10 ` [meta-darwin][PATCH 18/21] util-linux-libuuid: fix GCC ICE in uuid_time.c on Darwin nativesdk ecordonnier
2026-10-14 14:10 ` [meta-darwin][PATCH 19/21] libedit: don't include glibc's stdc-predef.h " ecordonnier
2026-10-14 14:10 ` [meta-darwin][PATCH 20/21] bash: link the in-tree readline " ecordonnier
2026-10-14 14:10 ` [meta-darwin][PATCH 21/21] gdb-cross-canadian: point --with-liblzma-prefix at the SDK sysroot prefix ecordonnier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261014141209.488034-3-ecordonnier@snap.com \
--to=ecordonnier@snap.com \
--cc=yocto-patches@lists.yoctoproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.