rpms/ceph
7
0
Fork 0
Code Issues Pull Requests Releases Activity

ceph-17.2.6, rebuild boost with -fcf-protection

Browse Source 
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
This commit is contained in:
Kaleb S. KEITHLEY 2023-04-28 07:51:05 -04:00
parent 2cc4dd5e37
commit dbd2b71d9d
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
0027-src-rocksdb-table-block_based-data_block_hash_index.h.patch
View File

@ -37,4 +37,14 @@
+#include <system_error>
#include <utility>
namespace folly {
--- ceph-17.2.6/src/rocksdb/third-party/folly/folly/synchronization/detail/ProxyLockable-inl.h.orig 2023-04-22 06:14:55.624679075 -0400
+++ ceph-17.2.6/src/rocksdb/third-party/folly/folly/synchronization/detail/ProxyLockable-inl.h 2023-04-22 09:18:39.424624618 -0400
@@ -13,6 +13,7 @@
#include <memory>
#include <mutex>
#include <stdexcept>
+#include <system_error>
#include <utility>
namespace folly {

10
0028-cmake-modules-BuildBoost.cmake.patch
View File

@ -1,11 +1,15 @@
--- ceph-17.2.6/cmake/modules/BuildBoost.cmake.orig 2023-04-27 14:00:28.239524778 -0400
+++ ceph-17.2.6/cmake/modules/BuildBoost.cmake 2023-04-27 15:44:46.738462191 -0400
@@ -63,7 +63,7 @@
+++ ceph-17.2.6/cmake/modules/BuildBoost.cmake 2023-04-28 07:49:59.743342207 -0400
@@ -63,7 +63,11 @@
else()
list(APPEND boost_features "address-model=32")
endif()
- set(BOOST_CXXFLAGS "-fPIC -w") # check on arm, etc <---XXX
+ set(BOOST_CXXFLAGS "-fPIC -w -fcf-protection") # check on arm, etc <---XXX
+ if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
+ set(BOOST_CXXFLAGS "-fPIC -w -fcf-protection") # check on arm, etc <---XXX
+ else()
+ set(BOOST_CXXFLAGS "-fPIC -w") # check on arm, etc <---XXX
+ endif()
list(APPEND boost_features "cxxflags=${BOOST_CXXFLAGS}")
set(boost_with_libs)