commit:     8430cafd2d19ed29b89829b7d61a033dbf55005b
Author:     Vadim Misbakh-Soloviov <mva <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  2 11:37:33 2020 +0000
Commit:     Vadim Misbakh-Soloviov <mva <AT> gentoo <DOT> org>
CommitDate: Fri Oct  2 11:37:33 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8430cafd

sys-cluster/ceph: fix building with glibc-2.32

Bug: https://bugs.gentoo.org/739042
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Vadim Misbakh-Soloviov <mva <AT> gentoo.org>

 sys-cluster/ceph/ceph-15.2.4-r3.ebuild              |  1 +
 sys-cluster/ceph/ceph-15.2.5-r1.ebuild              |  1 +
 sys-cluster/ceph/files/ceph-15.2.5-glibc-2.32.patch | 15 +++++++++++++++
 3 files changed, 17 insertions(+)

diff --git a/sys-cluster/ceph/ceph-15.2.4-r3.ebuild 
b/sys-cluster/ceph/ceph-15.2.4-r3.ebuild
index d3903349156..5a32d2f3787 100644
--- a/sys-cluster/ceph/ceph-15.2.4-r3.ebuild
+++ b/sys-cluster/ceph/ceph-15.2.4-r3.ebuild
@@ -199,6 +199,7 @@ PATCHES=(
        "${FILESDIR}/ceph-15.2.3-spdk-compile.patch"
        "${FILESDIR}/ceph-14.2.10-python-warnings.patch"
        "${FILESDIR}/ceph-15.2.4-system-uring.patch"
+       "${FILESDIR}/ceph-15.2.5-glibc-2.32.patch"
 )
 
 check-reqs_export_vars() {

diff --git a/sys-cluster/ceph/ceph-15.2.5-r1.ebuild 
b/sys-cluster/ceph/ceph-15.2.5-r1.ebuild
index e86923bb252..ace42c44650 100644
--- a/sys-cluster/ceph/ceph-15.2.5-r1.ebuild
+++ b/sys-cluster/ceph/ceph-15.2.5-r1.ebuild
@@ -201,6 +201,7 @@ PATCHES=(
        "${FILESDIR}/ceph-15.2.4-system-uring.patch"
        "${FILESDIR}/ceph-15.2.5-missing-includes.patch"
        "${FILESDIR}/ceph-15.2.5-systemd-unit-fix.patch"
+       "${FILESDIR}/ceph-15.2.5-glibc-2.32.patch"
 )
 
 check-reqs_export_vars() {

diff --git a/sys-cluster/ceph/files/ceph-15.2.5-glibc-2.32.patch 
b/sys-cluster/ceph/files/ceph-15.2.5-glibc-2.32.patch
new file mode 100644
index 00000000000..f8f7fad8b65
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-15.2.5-glibc-2.32.patch
@@ -0,0 +1,15 @@
+diff -NaurBwdp a/src/global/signal_handler.h src/global/b/signal_handler.h
+--- a/src/global/signal_handler.h      2020-10-01 03:15:48.208164979 +0700
++++ b/src/global/signal_handler.h      2020-10-01 03:15:40.655244081 +0700
+@@ -20,11 +20,7 @@
+ 
+ typedef void (*signal_handler_t)(int);
+ 
+-#ifndef HAVE_REENTRANT_STRSIGNAL
+-# define sig_str(signum) sys_siglist[signum]
+-#else
+ # define sig_str(signum) strsignal(signum)
+-#endif
+ 
+ void install_sighandler(int signum, signal_handler_t handler, int flags);
+ 

Reply via email to