]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cmake: remove _FORTIFY_SOURCE define 65377/head
authorCasey Bodley <cbodley@redhat.com>
Wed, 3 Sep 2025 17:22:30 +0000 (13:22 -0400)
committerDavid Galloway <david.galloway@ibm.com>
Wed, 3 Sep 2025 23:12:50 +0000 (19:12 -0400)
according to `dpkg-buildflags`, ubuntu 24 raised this value to
`-D_FORTIFY_SOURCE=3` which causes `error: "_FORTIFY_SOURCE" redefined`
compilation failures because Ceph itself adds `-D_FORTIFY_SOURCE=2`

`_FORTIFY_SOURCE` is a hardening option. both our rpm and debian builds
already specify that via environment variables, so Ceph's cmake should
leave it alone

Fixes: https://tracker.ceph.com/issues/72361
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 66bec97b0dc90b91f5be586351f52082beb6374a)

src/CMakeLists.txt

index 801086e1268a121af683c32f043dd2ec4c92dd6d..a0e8c583ab5e5458e7165064435a0ed62841094f 100644 (file)
@@ -196,14 +196,6 @@ endif()
 
 include(CheckCCompilerFlag)
 if(CMAKE_CXX_COMPILER_ID STREQUAL GNU)
-  CHECK_C_COMPILER_FLAG("-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2" HAS_FORTIFY_SOURCE)
-  if(NOT CMAKE_BUILD_TYPE STREQUAL Debug)
-    if(HAS_FORTIFY_SOURCE)
-      add_definitions(
-        -U_FORTIFY_SOURCE
-        -D_FORTIFY_SOURCE=2)
-    endif()
-  endif()
     CHECK_C_COMPILER_FLAG(-fstack-protector-strong HAS_STACK_PROTECT)
     if (HAS_STACK_PROTECT)
       add_compile_options(-fstack-protector-strong)