diff options
4 files changed, 11 insertions, 104 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 024894b..c6db8d9 100644 --- a/recipes-devtools/clang/clang/0037-Fixes_for_Darwin_SDKs.patch +++ b/recipes-devtools/clang/clang/0037-Fixes_for_Darwin_SDKs.patch @@ -22,13 +22,13 @@ index f7da3f187814..0656f5cbad69 100644 - "4.2.1", - "i686-apple-darwin10", - arch == llvm::Triple::x86_64 ? "x86_64" : ""); -+ "11.3.0", ++ "11.4.0", + "x86_64#SDK_VENDOR#-darwin21", + ""); IsBaseFound |= AddGnuCPlusPlusIncludePaths(DriverArgs, CC1Args, UsrIncludeCxx, - "4.0.0", "i686-apple-darwin8", - ""); -+ "11.3.0", "", ""); ++ "11.4.0", "", ""); + { + const char *S = ::getenv("YOCTO_SDKPATH"); + if (S && (S[0] != '\0')) { diff --git a/recipes-devtools/gcc/files/0001-libstdcxx-Rename-null-terminated-to-avoid-collision.patch b/recipes-devtools/gcc/files/0001-libstdcxx-Rename-null-terminated-to-avoid-collision.patch deleted file mode 100644 index ff7b912..0000000 --- a/recipes-devtools/gcc/files/0001-libstdcxx-Rename-null-terminated-to-avoid-collision.patch +++ /dev/null @@ -1,81 +0,0 @@ -From d1201dbf55a11d391030914985ba6b443e59baa5 Mon Sep 17 00:00:00 2001 -From: Mark Mentovai <mark@mentovai.com> -Date: Mon, 13 Jun 2022 16:40:19 +0100 -Subject: [PATCH] libstdc++: Rename __null_terminated to avoid collision with - Apple SDK - -The macOS 13 SDK (and equivalent-version iOS and other Apple OS SDKs) -contain this definition in <sys/cdefs.h>: - -863 #define __null_terminated - -This collides with the use of __null_terminated in libstdc++'s -experimental fs_path.h. - -As libstdc++'s use of this token is entirely internal to fs_path.h, the -simplest workaround, renaming it, is most appropriate. Here, it's -renamed to __nul_terminated, referencing the NUL ('\0') value that is -used to terminate the strings in the context in which this tag structure -is used. - -libstdc++-v3/ChangeLog: - - * include/experimental/bits/fs_path.h (__detail::__null_terminated): - Rename to __nul_terminated to avoid colliding with a macro in - Apple's SDK. - -Signed-off-by: Mark Mentovai <mark@mentovai.com> -(cherry picked from commit 254e88b3d7e8abcc236be3451609834371cf4d5d) ---- - libstdc++-v3/include/experimental/bits/fs_path.h | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/libstdc++-v3/include/experimental/bits/fs_path.h b/libstdc++-v3/include/experimental/bits/fs_path.h -index b0825ba76e803..19d246100cb5a 100644 ---- a/libstdc++-v3/include/experimental/bits/fs_path.h -+++ b/libstdc++-v3/include/experimental/bits/fs_path.h -@@ -140,10 +140,10 @@ namespace __detail - inline _Source - _S_range_begin(_Source __begin) { return __begin; } - -- struct __null_terminated { }; -+ struct __nul_terminated { }; - - template<typename _Source> -- inline __null_terminated -+ inline __nul_terminated - _S_range_end(_Source) { return {}; } - - template<typename _CharT, typename _Traits, typename _Alloc> -@@ -459,11 +459,11 @@ namespace __detail - struct _Cvt; - - static string_type -- _S_convert(value_type* __src, __detail::__null_terminated) -+ _S_convert(value_type* __src, __detail::__nul_terminated) - { return string_type(__src); } - - static string_type -- _S_convert(const value_type* __src, __detail::__null_terminated) -+ _S_convert(const value_type* __src, __detail::__nul_terminated) - { return string_type(__src); } - - template<typename _Iter> -@@ -477,7 +477,7 @@ namespace __detail - - template<typename _InputIterator> - static string_type -- _S_convert(_InputIterator __src, __detail::__null_terminated) -+ _S_convert(_InputIterator __src, __detail::__nul_terminated) - { - auto __s = _S_string_from_iter(__src); - return _S_convert(__s.c_str(), __s.c_str() + __s.size()); -@@ -504,7 +504,7 @@ namespace __detail - - template<typename _InputIterator> - static string_type -- _S_convert_loc(_InputIterator __src, __detail::__null_terminated, -+ _S_convert_loc(_InputIterator __src, __detail::__nul_terminated, - const std::locale& __loc) - { - const std::string __s = _S_string_from_iter(__src); diff --git a/recipes-devtools/gcc/files/0100-change-macosx-version-min-to-12.3.patch b/recipes-devtools/gcc/files/0100-change-macosx-version-min-to-12.3.patch index 5b28bf1..d1f22b9 100644 --- a/recipes-devtools/gcc/files/0100-change-macosx-version-min-to-12.3.patch +++ b/recipes-devtools/gcc/files/0100-change-macosx-version-min-to-12.3.patch @@ -1,4 +1,4 @@ -From 07ee0f0eb8442174b2e5d39862bd99952c2cfb64 Mon Sep 17 00:00:00 2001 +From 8f7f5820b24f57460e26440e770c8407ec11e10d Mon Sep 17 00:00:00 2001 From: Etienne Cordonnier <ecordonnier@snap.com> Date: Thu, 11 Aug 2022 15:39:44 +0200 Subject: [PATCH] change macosx-version-min to 12.3 @@ -6,33 +6,22 @@ Subject: [PATCH] change macosx-version-min to 12.3 Upstream-Status: Inappropriate [OE specific] Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com> --- - libgcc/config/t-darwin | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) + libgcc/config/t-darwin | 3 +++ + 1 file changed, 3 insertions(+) diff --git a/libgcc/config/t-darwin b/libgcc/config/t-darwin -index 299d26c2c96..c7117023277 100644 +index a3bb70c6a0a..8923a375c68 100644 --- a/libgcc/config/t-darwin +++ b/libgcc/config/t-darwin -@@ -1,15 +1,15 @@ +@@ -1,5 +1,8 @@ # Set this as a minimum (unless overriden by arch t-files) since it's a # reasonable lowest common denominator that works for all our archs. --HOST_LIBGCC2_CFLAGS += -mmacosx-version-min=10.4 -+HOST_LIBGCC2_CFLAGS += -mmacosx-version-min=12.3 ++DARWIN_MIN_CRT_VERSION="-mmacosx-version-min=12.3" ++DARWIN_MIN_LIB_VERSION="-mmacosx-version-min=12.3" ++ + HOST_LIBGCC2_CFLAGS += $(DARWIN_MIN_LIB_VERSION) crt3.o: $(srcdir)/config/darwin-crt3.c -- $(crt_compile) -mmacosx-version-min=10.4 -c $< -+ $(crt_compile) -mmacosx-version-min=12.3 -c $< - - crttms.o: $(srcdir)/config/darwin-crt-tm.c -- $(crt_compile) -mmacosx-version-min=10.4 -DSTART -c $< -+ $(crt_compile) -mmacosx-version-min=12.3 -DSTART -c $< - - crttme.o: $(srcdir)/config/darwin-crt-tm.c -- $(crt_compile) -mmacosx-version-min=10.4 -DEND -c $< -+ $(crt_compile) -mmacosx-version-min=12.3 -DEND -c $< - - # Make emutls weak so that we can deal with -static-libgcc, override the - # hidden visibility when this is present in libgcc_eh. -- 2.36.1.vfs.0.0 diff --git a/recipes-devtools/gcc/gcc-source_%.bbappend b/recipes-devtools/gcc/gcc-source_%.bbappend index a2b117a..110462d 100644 --- a/recipes-devtools/gcc/gcc-source_%.bbappend +++ b/recipes-devtools/gcc/gcc-source_%.bbappend @@ -4,5 +4,4 @@ SRC_URI:append = "\ file://0099-nativesdk-gcc-darwin.patch \ file://0100-change-macosx-version-min-to-12.3.patch \ file://0101-optional-libstdc.patch \ - file://0001-libstdcxx-Rename-null-terminated-to-avoid-collision.patch \ " |