[gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/files/, sys-cluster/ceph/

[Patrick Lauer]

commit:     97e5262b48cac39e434609ffa6df0e8d2a1bc30b
Author:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 26 12:16:28 2025 +0000
Commit:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
CommitDate: Wed Feb 26 12:17:30 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97e5262b

sys-cluster/ceph: More cleanups

Remove nasm hack for isa-l,
and add patch to quiet compiler some warnings.

Signed-off-by: Patrick Lauer <patrick <AT> gentoo.org>

 .../ceph/{ceph-19.2.1-r1.ebuild => ceph-19.2.1-r2.ebuild}   |  3 +--
 .../ceph/files/ceph-19.2.1-quiet-stringop-truncation.patch  | 13 +++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/sys-cluster/ceph/ceph-19.2.1-r1.ebuild 
b/sys-cluster/ceph/ceph-19.2.1-r2.ebuild
similarity index 99%
rename from sys-cluster/ceph/ceph-19.2.1-r1.ebuild
rename to sys-cluster/ceph/ceph-19.2.1-r2.ebuild
index 906be944997e..2b979e4ae6b7 100644
--- a/sys-cluster/ceph/ceph-19.2.1-r1.ebuild
+++ b/sys-cluster/ceph/ceph-19.2.1-r2.ebuild
@@ -240,6 +240,7 @@ PATCHES=(
        "${FILESDIR}/ceph-19.2.1-mgr.patch"
        "${FILESDIR}/ceph-19.2.1-exporter.patch"
        "${FILESDIR}/ceph-19.2.1-isa-l.patch"
+       "${FILESDIR}/ceph-19.2.1-quiet-stringop-truncation.patch"
 )
 
 check-reqs_export_vars() {
@@ -365,8 +366,6 @@ ceph_src_configure() {
                -DCMAKE_DISABLE_FIND_PACKAGE_fmt=ON
                -Wno-dev
                -DCEPHADM_BUNDLED_DEPENDENCIES=none
-               # isa-l is very question mark exclamation mark
-               -DHAVE_NASM_X64=no
        )
 
        # this breaks when re-configuring for python impl

diff --git a/sys-cluster/ceph/files/ceph-19.2.1-quiet-stringop-truncation.patch 
b/sys-cluster/ceph/files/ceph-19.2.1-quiet-stringop-truncation.patch
new file mode 100644
index 000000000000..5332b029cf2d
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-19.2.1-quiet-stringop-truncation.patch
@@ -0,0 +1,13 @@
+diff --git a/src/log/Entry.h b/src/log/Entry.h
+index db39eca0ef3..5e414b1d2f3 100644
+--- a/src/log/Entry.h
++++ b/src/log/Entry.h
+@@ -32,7 +32,7 @@ public:
+     m_prio(pr),
+     m_subsys(sub)
+   {
+-    strncpy(m_thread_name, Thread::get_thread_name().data(), 16);
++    strncpy(m_thread_name, Thread::get_thread_name().data(), 15);
+     m_thread_name[15] = '\0';
+   }
+   Entry(const Entry &) = default;