diff options
Diffstat (limited to 'meta/recipes-sato/webkit/webkitgtk/0001-Cherry-pick-292304-main-7ffc29624258-.-https-bugs.we.patch')
| -rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/0001-Cherry-pick-292304-main-7ffc29624258-.-https-bugs.we.patch | 75 |
1 files changed, 0 insertions, 75 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Cherry-pick-292304-main-7ffc29624258-.-https-bugs.we.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Cherry-pick-292304-main-7ffc29624258-.-https-bugs.we.patch deleted file mode 100644 index 5cbb1035b2..0000000000 --- a/meta/recipes-sato/webkit/webkitgtk/0001-Cherry-pick-292304-main-7ffc29624258-.-https-bugs.we.patch +++ /dev/null | |||
| @@ -1,75 +0,0 @@ | |||
| 1 | From 83093455d02d73a327cea502d974aac82b59ad17 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Adrian Perez de Castro <aperez@igalia.com> | ||
| 3 | Date: Tue, 18 Mar 2025 07:39:01 -0700 | ||
| 4 | Subject: [PATCH] Cherry-pick 292304@main (7ffc29624258). | ||
| 5 | https://bugs.webkit.org/show_bug.cgi?id=289953 | ||
| 6 | |||
| 7 | [GTK][WPE] Use _LIBCPP_HARDENING_MODE with newer libc++ versions | ||
| 8 | https://bugs.webkit.org/show_bug.cgi?id=289953 | ||
| 9 | |||
| 10 | Reviewed by Alicia Boya Garcia. | ||
| 11 | |||
| 12 | * Source/cmake/OptionsCommon.cmake: Add a new check for the libc++ | ||
| 13 | version, if it is 19 or newer, use the new _LIBCPP_HARDENING_MODE | ||
| 14 | macro, otherwise for older versions keep _LIBCPP_ENABLE_ASSERTIONS. | ||
| 15 | |||
| 16 | Canonical link: https://commits.webkit.org/292304@main | ||
| 17 | |||
| 18 | Upstream-Status: Backport [https://github.com/WebKit/WebKit/commit/2c105443d41e5ce3de3a4cac2ed8a07ebd134459] | ||
| 19 | |||
| 20 | Canonical link: https://commits.webkit.org/290945.71@webkitglib/2.48 | ||
| 21 | |||
| 22 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 23 | --- | ||
| 24 | Source/cmake/OptionsCommon.cmake | 24 +++++++++++++++++++----- | ||
| 25 | 1 file changed, 19 insertions(+), 5 deletions(-) | ||
| 26 | |||
| 27 | diff --git a/Source/cmake/OptionsCommon.cmake b/Source/cmake/OptionsCommon.cmake | ||
| 28 | index f6cf5ee..3178674 100644 | ||
| 29 | --- a/Source/cmake/OptionsCommon.cmake | ||
| 30 | +++ b/Source/cmake/OptionsCommon.cmake | ||
| 31 | @@ -229,8 +229,22 @@ set(CXX_STDLIB_TEST_SOURCE " | ||
| 32 | ") | ||
| 33 | check_cxx_source_compiles("${CXX_STDLIB_TEST_SOURCE}" CXX_STDLIB_IS_LIBCPP) | ||
| 34 | if (CXX_STDLIB_IS_LIBCPP) | ||
| 35 | - set(CXX_STDLIB_VARIANT "LIBCPP") | ||
| 36 | - set(CXX_STDLIB_ASSERTIONS_MACRO _LIBCPP_ENABLE_ASSERTIONS) | ||
| 37 | + set(CXX_STDLIB_TEST_SOURCE " | ||
| 38 | + #include <utility> | ||
| 39 | + #if _LIBCPP_VERSION >= 190000 | ||
| 40 | + int main() { } | ||
| 41 | + #else | ||
| 42 | + #error libc++ is older than 19.x | ||
| 43 | + #endif | ||
| 44 | + ") | ||
| 45 | + check_cxx_source_compiles("${CXX_STDLIB_TEST_SOURCE}" CXX_STDLIB_IS_LIBCPP_19_OR_NEWER) | ||
| 46 | + if (CXX_STDLIB_IS_LIBCPP_19_OR_NEWER) | ||
| 47 | + set(CXX_STDLIB_VARIANT "LIBCPP 19+") | ||
| 48 | + set(CXX_STDLIB_ASSERTIONS_MACRO _LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE) | ||
| 49 | + else () | ||
| 50 | + set(CXX_STDLIB_VARIANT "LIBCPP <19") | ||
| 51 | + set(CXX_STDLIB_ASSERTIONS_MACRO _LIBCPP_ENABLE_ASSERTIONS=1) | ||
| 52 | + endif () | ||
| 53 | else () | ||
| 54 | set(CXX_STDLIB_TEST_SOURCE " | ||
| 55 | #include <utility> | ||
| 56 | @@ -239,7 +253,7 @@ else () | ||
| 57 | check_cxx_source_compiles("${CXX_STDLIB_TEST_SOURCE}" CXX_STDLIB_IS_GLIBCXX) | ||
| 58 | if (CXX_STDLIB_IS_GLIBCXX) | ||
| 59 | set(CXX_STDLIB_VARIANT "GLIBCXX") | ||
| 60 | - set(CXX_STDLIB_ASSERTIONS_MACRO _GLIBCXX_ASSERTIONS) | ||
| 61 | + set(CXX_STDLIB_ASSERTIONS_MACRO _GLIBCXX_ASSERTIONS=1) | ||
| 62 | endif () | ||
| 63 | endif () | ||
| 64 | message(STATUS "C++ standard library in use: ${CXX_STDLIB_VARIANT}") | ||
| 65 | @@ -255,8 +269,8 @@ option(USE_CXX_STDLIB_ASSERTIONS | ||
| 66 | |||
| 67 | if (USE_CXX_STDLIB_ASSERTIONS) | ||
| 68 | if (CXX_STDLIB_ASSERTIONS_MACRO) | ||
| 69 | - message(STATUS " Assertions enabled, ${CXX_STDLIB_ASSERTIONS_MACRO}=1") | ||
| 70 | - add_compile_definitions("${CXX_STDLIB_ASSERTIONS_MACRO}=1") | ||
| 71 | + message(STATUS " Assertions enabled, ${CXX_STDLIB_ASSERTIONS_MACRO}") | ||
| 72 | + add_compile_definitions("${CXX_STDLIB_ASSERTIONS_MACRO}") | ||
| 73 | else () | ||
| 74 | message(STATUS " Assertions disabled, CXX_STDLIB_ASSERTIONS_MACRO undefined") | ||
| 75 | endif () | ||
