blob: 6c585c2f5bf2f8a074978e479e827c732a0c21b0 [file] [log] [blame]
Patrick Williams92b42cb2022-09-03 06:53:57 -05001From 8486b912281ae85db0c9fc05bb546f16872e114c Mon Sep 17 00:00:00 2001
2From: Paulo Neves <ptsneves@gmail.com>
3Date: Thu, 28 Jul 2022 14:37:18 +0200
4Subject: [PATCH] mbedtls: Do not overwrite CFLAGS
5
6bitbake passes CFLAGS that are often in conflict with the ones set
7in mbedtls' CMakeLists.txt. Such conflicts are the inability to use
8FORTIFY_SOURCE=2 except in release mode
9
Patrick Williamsb9af8752023-01-30 13:28:01 -060010Upstream-Status: Innapropriate [due to fluent-bit having it's own Release flags that also overwrite bitbake ones.]
Patrick Williams92b42cb2022-09-03 06:53:57 -050011---
12 lib/mbedtls-2.28.0/CMakeLists.txt | 2 --
13 1 file changed, 2 deletions(-)
14
15--- a/lib/mbedtls-2.28.0/CMakeLists.txt
16+++ b/lib/mbedtls-2.28.0/CMakeLists.txt
17@@ -204,8 +204,6 @@ if(CMAKE_COMPILER_IS_GNU)
18 if (GCC_VERSION VERSION_GREATER 7.0 OR GCC_VERSION VERSION_EQUAL 7.0)
19 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wformat-overflow=2 -Wformat-truncation")
20 endif()
21- set(CMAKE_C_FLAGS_RELEASE "-O2")
22- set(CMAKE_C_FLAGS_DEBUG "-O0 -g3")
23 set(CMAKE_C_FLAGS_COVERAGE "-O0 -g3 --coverage")
24 set(CMAKE_C_FLAGS_ASAN "-fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover=all -O3")
25 set(CMAKE_C_FLAGS_ASANDBG "-fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover=all -O1 -g3 -fno-omit-frame-pointer -fno-optimize-sibling-calls")
26@@ -215,8 +213,6 @@ endif(CMAKE_COMPILER_IS_GNU)
27
28 if(CMAKE_COMPILER_IS_CLANG)
29 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wwrite-strings -Wpointer-arith -Wimplicit-fallthrough -Wshadow -Wvla -Wformat=2 -Wno-format-nonliteral")
30- set(CMAKE_C_FLAGS_RELEASE "-O2")
31- set(CMAKE_C_FLAGS_DEBUG "-O0 -g3")
32 set(CMAKE_C_FLAGS_COVERAGE "-O0 -g3 --coverage")
33 set(CMAKE_C_FLAGS_ASAN "-fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover=all -O3")
34 set(CMAKE_C_FLAGS_ASANDBG "-fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover=all -O1 -g3 -fno-omit-frame-pointer -fno-optimize-sibling-calls")