MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 12:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

rpm: Update 0001-CMakeLists.txt-Fix-checking-for-CFLAGS.patch

Browse Source 
The patch merged by upstream is different, so backport the one from upstream.

(From OE-Core rev: 65fd3c93285e0a166f0d77a92cc42680d72a6bd1)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Robert Yang 2025-06-19 23:09:32 -07:00 committed by Richard Purdie
parent 6091ebc9c5
commit 2156cb9598
1 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-Fix-checking-for-CFLAGS.patch
View File

@ -1,18 +1,9 @@
From 19f7ef341f19ac5594c7d0113f9eb8224934464a Mon Sep 17 00:00:00 2001 From e14502834fe6a9c6c9a439401ac3d2c8fd979267 Mon Sep 17 00:00:00 2001
From: Robert Yang <liezhi.yang@windriver.com> From: Robert Yang <liezhi.yang@windriver.com>
Date: Sun, 8 Jun 2025 00:19:06 -0700 Date: Sun, 8 Jun 2025 00:36:38 -0700
Subject: [PATCH] CMakeLists.txt: Fix checking for CFLAGS Subject: [PATCH] CMakeLists.txt: Improve checking for CFLAGS
The previous code doesn't work because the check_c_compiler_flag() only ran The previous log wasn't clear:
once because 'found' is in CACHE, here is log:
-- Performing Test found
-- Performing Test found - Success
That would result in:
* All the flags are added when the first one works
* None of the flags is added when the first one doesn't work
We can use "unset(found CACHE)" to fix that, but the log is still not clear:
-- Performing Test found -- Performing Test found
-- Performing Test found - Success -- Performing Test found - Success
-- Performing Test found -- Performing Test found
@ -20,15 +11,15 @@ We can use "unset(found CACHE)" to fix that, but the log is still not clear:
-- Performing Test found -- Performing Test found
-- Performing Test found - Failed -- Performing Test found - Failed
Use a new var SUPPORTS_${flag} will make it more clear: Use a new var compiler-supports${flag} will make it more clear:
-- Performing Test SUPPORTS_-fno-strict-overflow -- Performing Test compiler-supports-fno-strict-overflow
-- Performing Test SUPPORTS_-fno-strict-overflow - Success -- Performing Test compiler-supports-fno-strict-overflow - Success
-- Performing Test SUPPORTS_-fno-delete-null-pointer-checks -- Performing Test compiler-supports-fno-delete-null-pointer-checks
-- Performing Test SUPPORTS_-fno-delete-null-pointer-checks - Success -- Performing Test compiler-supports-fno-delete-null-pointer-checks - Success
-- Performing Test SUPPORTS_-fhardened -- Performing Test compiler-supports-fhardened
-- Performing Test SUPPORTS_-fhardened - Failed -- Performing Test compiler-supports-fhardened - Failed
Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/pull/3796] Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/e14502834fe6a9c6c9a439401ac3d2c8fd979267]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
--- ---
@ -36,7 +27,7 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
1 file changed, 2 insertions(+), 3 deletions(-) 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index 08e3e5274..a7566ab5a 100644 index 08e3e5274..f275c396b 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -416,11 +416,10 @@ endif() @@ -416,11 +416,10 @@ endif()
@ -45,14 +36,11 @@ index 08e3e5274..a7566ab5a 100644
foreach (flag -fno-strict-overflow -fno-delete-null-pointer-checks -fhardened) foreach (flag -fno-strict-overflow -fno-delete-null-pointer-checks -fhardened)
- check_c_compiler_flag(${flag} found) - check_c_compiler_flag(${flag} found)
- if (found) - if (found)
+ check_c_compiler_flag(${flag} SUPPORTS_${flag}) + check_c_compiler_flag(${flag} compiler-supports${flag})
+ if (SUPPORTS_${flag}) + if (compiler-supports${flag})
add_compile_options(${flag}) add_compile_options(${flag})
endif() endif()
- unset(found) - unset(found)
endforeach() endforeach()
# generated sources # generated sources
--
2.49.0