From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 7CCFBBFE3F for ; Tue, 9 Jan 2024 15:50:39 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 56D0F19DF1 for ; Tue, 9 Jan 2024 15:50:39 +0100 (CET) Received: from bastionodiso.odiso.net (bastionodiso.odiso.net [185.151.191.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 9 Jan 2024 15:50:37 +0100 (CET) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id 23F7682AE; Tue, 9 Jan 2024 15:50:31 +0100 (CET) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 1B2DAD0A23; Tue, 9 Jan 2024 15:50:31 +0100 (CET) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Tue, 9 Jan 2024 15:50:30 +0100 Message-Id: <20240109145030.1647121-3-aderumier@odiso.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240109145030.1647121-1-aderumier@odiso.com> References: <20240109145030.1647121-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.031 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy HEADER_FROM_DIFFERENT_DOMAINS 0.248 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH ceph 2/2] patch: add 0022-rocksb-inherit-parent-cmake-cxx-flags.patch X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Jan 2024 14:50:39 -0000 upstream patch: https://github.com/ceph/ceph/pull/54918 --- ...ocksb-inherit-parent-cmake-cxx-flags.patch | 57 +++++++++++++++++++ patches/series | 3 +- 2 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 patches/0022-rocksb-inherit-parent-cmake-cxx-flags.patch diff --git a/patches/0022-rocksb-inherit-parent-cmake-cxx-flags.patch b/patches/0022-rocksb-inherit-parent-cmake-cxx-flags.patch new file mode 100644 index 000000000..8d61ce7e0 --- /dev/null +++ b/patches/0022-rocksb-inherit-parent-cmake-cxx-flags.patch @@ -0,0 +1,57 @@ +From 620b68a348f07145c49c12668576a89dee8198cb Mon Sep 17 00:00:00 2001 +From: Kefu Chai +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 +--- + 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 f9a28274c40d2..f81f5248506dd 100644 +--- a/cmake/modules/BuildRocksDB.cmake ++++ b/cmake/modules/BuildRocksDB.cmake +@@ -60,11 +60,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}') + +diff --git a/cmake/modules/BuildRocksDB.cmake b/cmake/modules/BuildRocksDB.cmake +index f81f5248506dd..e0208f6545b70 100644 +--- a/cmake/modules/BuildRocksDB.cmake ++++ b/cmake/modules/BuildRocksDB.cmake +@@ -59,6 +59,7 @@ 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) + string(APPEND rocksdb_CXX_FLAGS " -Wno-deprecated-copy") + endif() diff --git a/patches/series b/patches/series index d9a3ff8f4..eddd47031 100644 --- a/patches/series +++ b/patches/series @@ -13,4 +13,5 @@ 0016-d-rules-fix-no-restart-on-upgrade.patch 0017-python3.10-pep-620.patch 0020-fix-4759-run-ceph-crash-daemon-with-www-data-group-f.patch -0021-debian-rules-fix-buildtype.patch \ No newline at end of file +0021-debian-rules-fix-buildtype.patch +0022-rocksb-inherit-parent-cmake-cxx-flags.patch \ No newline at end of file -- 2.39.2