diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 18:47:13 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 18:47:13 +0000 |
| commit | 10adcb1fe8156a91276ac738834ba5a4f0527724 (patch) | |
| tree | 018c628dc66febe656158711cdcfd0bc79007bcf /debian/patches/progress-linux/0001-rocksdb-cxxflags-1.patch | |
| parent | Removing unneeded depends in ceph-mon for shorter dependency chains. (diff) | |
| download | ceph-10adcb1fe8156a91276ac738834ba5a4f0527724.tar.xz ceph-10adcb1fe8156a91276ac738834ba5a4f0527724.zip | |
Adding patches from upstream to fix CXXFLAGS in embedded rocksdb causing performance issues.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/progress-linux/0001-rocksdb-cxxflags-1.patch')
| -rw-r--r-- | debian/patches/progress-linux/0001-rocksdb-cxxflags-1.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/debian/patches/progress-linux/0001-rocksdb-cxxflags-1.patch b/debian/patches/progress-linux/0001-rocksdb-cxxflags-1.patch new file mode 100644 index 000000000..0c96c8399 --- /dev/null +++ b/debian/patches/progress-linux/0001-rocksdb-cxxflags-1.patch @@ -0,0 +1,23 @@ +Author: Kefu Chai <tchaikov@gmail.com> +Description: cmake/modules/BuildRocksDB.cmake: use string(APPEND ..) when appropriate + less repeatings this way. + . + https://lists.ceph.io/hyperkitty/list/ceph-users@ceph.io/thread/W5QEP4PM6G6L62W5PNJMGXU4Y26437XL/ + +diff -Naurp ceph.orig/cmake/modules/BuildRocksDB.cmake ceph/cmake/modules/BuildRocksDB.cmake +--- ceph.orig/cmake/modules/BuildRocksDB.cmake ++++ ceph/cmake/modules/BuildRocksDB.cmake +@@ -57,11 +57,11 @@ function(build_rocksdb) + include(CheckCXXCompilerFlag) + check_cxx_compiler_flag("-Wno-deprecated-copy" HAS_WARNING_DEPRECATED_COPY) + if(HAS_WARNING_DEPRECATED_COPY) +- set(rocksdb_CXX_FLAGS -Wno-deprecated-copy) ++ string(APPEND rocksdb_CXX_FLAGS " -Wno-deprecated-copy") + endif() + check_cxx_compiler_flag("-Wno-pessimizing-move" HAS_WARNING_PESSIMIZING_MOVE) + if(HAS_WARNING_PESSIMIZING_MOVE) +- set(rocksdb_CXX_FLAGS "${rocksdb_CXX_FLAGS} -Wno-pessimizing-move") ++ string(APPEND rocksdb_CXX_FLAGS " -Wno-pessimizing-move") + endif() + if(rocksdb_CXX_FLAGS) + list(APPEND rocksdb_CMAKE_ARGS -DCMAKE_CXX_FLAGS='${rocksdb_CXX_FLAGS}') |