Accepting request 1256239 from Base:System
Backport check_c_compiler_flag cmake tests fix from upstream OBS-URL: https://build.opensuse.org/request/show/1256239 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=321
This commit is contained in:
11
cmake_fhardened.diff
Normal file
11
cmake_fhardened.diff
Normal file
@@ -0,0 +1,11 @@
|
||||
--- CMakeLists.txt.orig 2025-03-26 13:46:52.439473029 +0000
|
||||
+++ CMakeLists.txt 2025-03-26 13:47:07.991447862 +0000
|
||||
@@ -436,7 +436,7 @@ foreach (flag -fno-strict-overflow -fno-
|
||||
if (found)
|
||||
add_compile_options(${flag})
|
||||
endif()
|
||||
- unset(found)
|
||||
+ unset(found CACHE)
|
||||
endforeach()
|
||||
|
||||
# generated sources
|
@@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 26 14:48:09 CET 2025 - mls@suse.de
|
||||
|
||||
- Backport check_c_compiler_flag cmake tests fix from upstream
|
||||
The old code would pick up -fhardened by accident
|
||||
* new patch: cmake_fhardened.diff
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 7 14:14:55 CET 2025 - mls@suse.de
|
||||
|
||||
|
3
rpm.spec
3
rpm.spec
@@ -123,6 +123,7 @@ Patch151: buildroot-symlink.diff
|
||||
Patch154: undefbuildroot.diff
|
||||
Patch155: rpm2archive.diff
|
||||
Patch156: mtime_policy_set.diff
|
||||
Patch157: cmake_fhardened.diff
|
||||
Patch6464: auto-config-update-aarch64-ppc64le.diff
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
#
|
||||
@@ -241,7 +242,7 @@ rm -rf sqlite
|
||||
%patch -P 131 -P 133 -P 134 -P 135 -P 136 -P 138
|
||||
%patch -P 139
|
||||
%patch -P 141 -P 142
|
||||
%patch -P 150 -P 151 -P 154 -P 155 -P 156
|
||||
%patch -P 150 -P 151 -P 154 -P 155 -P 156 -P 157
|
||||
|
||||
%ifarch aarch64 ppc64le riscv64 loongarch64
|
||||
%patch -P 6464
|
||||
|
Reference in New Issue
Block a user