[packages/ceph] - fix narrowing conversions on ix86

baggins baggins at pld-linux.org
Sun Dec 22 13:51:55 CET 2024


commit 6b0521498f92c20dd3c2b7b23489b36e4b73533e
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Dec 22 14:01:00 2024 +0100

    - fix narrowing conversions on ix86

 ceph.spec  |  2 ++
 ix86.patch | 14 ++++++++++++++
 2 files changed, 16 insertions(+)
---
diff --git a/ceph.spec b/ceph.spec
index 0689fa8..450d01a 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -79,6 +79,7 @@ Patch12:	%{name}-gcc14.patch
 Patch13:	boost-1.86.patch
 Patch14:	boost-1.87.patch
 Patch15:	x32.patch
+Patch16:	ix86.patch
 URL:		https://ceph.io/
 %{?with_qatzip:BuildRequires:	QATzip-devel}
 %{?with_babeltrace:BuildRequires:	babeltrace-devel}
@@ -355,6 +356,7 @@ uruchamiania demonów.
 %patch -P 13 -p1
 %patch -P 14 -p1
 %patch -P 15 -p1
+%patch -P 16 -p1
 
 %{__sed} -i -e '1s,/usr/bin/env bash,/bin/bash,' \
 	src/{ceph-post-file.in,rbd-replay-many,rbdmap} \
diff --git a/ix86.patch b/ix86.patch
new file mode 100644
index 0000000..ee12911
--- /dev/null
+++ b/ix86.patch
@@ -0,0 +1,14 @@
+--- ceph-19.2.0/src/include/utime.h.orig	2024-09-18 18:27:51.000000000 +0200
++++ ceph-19.2.0/src/include/utime.h	2024-12-22 12:49:17.783333334 +0100
+@@ -64,7 +64,11 @@
+   }
+ 
+   static inline constexpr utime_t max() {
++#if !defined(__x86_64__)
++    return utime_t{time_t{std::numeric_limits<int32_t>::max()}, 999'999'999ul};
++#else
+     return utime_t{time_t{std::numeric_limits<uint32_t>::max()}, 999'999'999ul};
++#endif
+   }
+ 
+   // cons
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ceph.git/commitdiff/6b0521498f92c20dd3c2b7b23489b36e4b73533e



More information about the pld-cvs-commit mailing list