drop superfluous build-type patch and re-order other one

As Fabian correctly noticed, from the two PR's, namely PR #54918[0]
and PR #54891[1], only the first one is necessary, that's why the
second one was closed upstream, so drop it here too to avoid a
unnecessary divergence from upstream.

[0]: https://github.com/ceph/ceph/pull/54918
[1]: https://github.com/ceph/ceph/pull/54891

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/patches/0012-debian-rules-fix-buildtype.patch b/patches/0012-debian-rules-fix-buildtype.patch
deleted file mode 100644 (file)
index 8b6ef6b..0000000
--- a/patches/0012-debian-rules-fix-buildtype.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 1f4b106d49fc916994d97e273599f75caa904c3b Mon Sep 17 00:00:00 2001
-From: Mark Nelson <mark.nelson@clyso.com>
-Date: Thu, 14 Dec 2023 05:19:46 +0000
-Subject: [PATCH] debian/rules: Fix build_type for massive performance gain
-
-Signed-off-by: Mark Nelson <mark.nelson@clyso.com>
----
- debian/rules | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/debian/rules b/debian/rules
-index ed7f4a255ed4b..b28abb7d62788 100755
---- a/debian/rules
-+++ b/debian/rules
-@@ -29,6 +29,7 @@ extraopts += -DWITH_PYTHON3=3
- extraopts += -DWITH_CEPHFS_JAVA=ON
- extraopts += -DWITH_CEPHFS_SHELL=ON
- extraopts += -DWITH_SYSTEMD=ON -DCEPH_SYSTEMD_ENV_DIR=/etc/default
-+extraopts += -DCMAKE_BUILD_TYPE=RelWithDebInfo
- extraopts += -DWITH_GRAFANA=ON
- ifeq ($(DEB_HOST_ARCH), amd64)
-   extraopts += -DWITH_RBD_RWL=ON

diff --git a/patches/0013-rocksb-inherit-parent-cmake-cxx-flags.patch b/patches/0013-rocksb-inherit-parent-cmake-cxx-flags.patch
deleted file mode 100644 (file)
index 5a6c7bf..0000000
--- a/patches/0013-rocksb-inherit-parent-cmake-cxx-flags.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 620b68a348f07145c49c12668576a89dee8198cb Mon Sep 17 00:00:00 2001
-From: Kefu Chai <tchaikov@gmail.com>
-Date: Fri, 15 Dec 2023 19:01:46 +0800
-Subject: [PATCH] cmake/modules/BuildRocksDB.cmake: inherit parent's CMAKE_CXX_FLAGS
-
-CMake allows us to customize `CMAKE_CXX_FLAGS` by setting CXXFLAGS
-environmental variable. and Debian's debhelper also sets CXXFLAGS
-when it builds cmake projects for customizing the building flags.
-
-but we fail to populate this setting down when building external
-projects. this is important when it comes to the projects which
-is critical to the performance. RocksDB is one of them.
-
-in this change, we pass the `CMAKE_CXX_FLAGS` down in
-`BuildRocksDB.cmake` so that its `CMAKE_CXX_FLAGS` contains
-the same set of `CMAKE_CXX_FLAGS` used by its parent project.
-
-this should help with the performance in the bluestore, where
-RocksDB is used.
-
-Signed-off-by: Kefu Chai <tchaikov@gmail.com>
- [TL: squashed in "cmake/modules/BuildRocksDB.cmake: use string(APPEND
-  ..) when appropriate" ]
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
----
- cmake/modules/BuildRocksDB.cmake | 4 ++--
- cmake/modules/BuildRocksDB.cmake | 1 +
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/modules/BuildRocksDB.cmake b/cmake/modules/BuildRocksDB.cmake
-index f9a28274c40..e0208f6545b 100644
---- a/cmake/modules/BuildRocksDB.cmake
-+++ b/cmake/modules/BuildRocksDB.cmake
-@@ -52,12 +52,13 @@ function(build_rocksdb)
-   endif()
-   include(CheckCXXCompilerFlag)
-   check_cxx_compiler_flag("-Wno-deprecated-copy" HAS_WARNING_DEPRECATED_COPY)
-+  set(rocksdb_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-   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}')

diff --git a/patches/0014-rocksb-inherit-parent-cmake-cxx-flags.patch b/patches/0014-rocksb-inherit-parent-cmake-cxx-flags.patch
new file mode 100644 (file)
index 0000000..5a6c7bf
--- /dev/null
+++ b/patches/0014-rocksb-inherit-parent-cmake-cxx-flags.patch
@@ -0,0 +1,49 @@
+From 620b68a348f07145c49c12668576a89dee8198cb Mon Sep 17 00:00:00 2001
+From: Kefu Chai <tchaikov@gmail.com>
+Date: Fri, 15 Dec 2023 19:01:46 +0800
+Subject: [PATCH] cmake/modules/BuildRocksDB.cmake: inherit parent's CMAKE_CXX_FLAGS
+
+CMake allows us to customize `CMAKE_CXX_FLAGS` by setting CXXFLAGS
+environmental variable. and Debian's debhelper also sets CXXFLAGS
+when it builds cmake projects for customizing the building flags.
+
+but we fail to populate this setting down when building external
+projects. this is important when it comes to the projects which
+is critical to the performance. RocksDB is one of them.
+
+in this change, we pass the `CMAKE_CXX_FLAGS` down in
+`BuildRocksDB.cmake` so that its `CMAKE_CXX_FLAGS` contains
+the same set of `CMAKE_CXX_FLAGS` used by its parent project.
+
+this should help with the performance in the bluestore, where
+RocksDB is used.
+
+Signed-off-by: Kefu Chai <tchaikov@gmail.com>
+ [TL: squashed in "cmake/modules/BuildRocksDB.cmake: use string(APPEND
+  ..) when appropriate" ]
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ cmake/modules/BuildRocksDB.cmake | 4 ++--
+ cmake/modules/BuildRocksDB.cmake | 1 +
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/modules/BuildRocksDB.cmake b/cmake/modules/BuildRocksDB.cmake
+index f9a28274c40..e0208f6545b 100644
+--- a/cmake/modules/BuildRocksDB.cmake
++++ b/cmake/modules/BuildRocksDB.cmake
+@@ -52,12 +52,13 @@ function(build_rocksdb)
+   endif()
+   include(CheckCXXCompilerFlag)
+   check_cxx_compiler_flag("-Wno-deprecated-copy" HAS_WARNING_DEPRECATED_COPY)
++  set(rocksdb_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+   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}')

diff --git a/patches/series b/patches/series
index 585fd13f0b6d9f71c74b0fb667691e6644f0d52d..865caf23d12b1106c1c6b2032bfa808923cbec9e 100644 (file)
--- a/patches/series
+++ b/patches/series
@@ -11,5 +11,4 @@
 0011-fix-compatibility-with-CPUs-not-supporting-SSE-4.1-i.patch
 0012-backport-mgr-dashboard-simplify-authentication-proto.patch
 0013-mgr-dashboard-remove-ability-to-create-and-check-TLS.patch
-0012-debian-rules-fix-buildtype.patch
-0013-rocksb-inherit-parent-cmake-cxx-flags.patch
+0014-rocksb-inherit-parent-cmake-cxx-flags.patch