Gentoo Archives: gentoo-commits

From: Vadim Misbakh-Soloviov <mva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/files/, sys-cluster/ceph/
Date: Fri, 02 Oct 2020 11:37:44
Message-Id: 1601638653.8430cafd2d19ed29b89829b7d61a033dbf55005b.mva@gentoo
1 commit: 8430cafd2d19ed29b89829b7d61a033dbf55005b
2 Author: Vadim Misbakh-Soloviov <mva <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 2 11:37:33 2020 +0000
4 Commit: Vadim Misbakh-Soloviov <mva <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 2 11:37:33 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8430cafd
7
8 sys-cluster/ceph: fix building with glibc-2.32
9
10 Bug: https://bugs.gentoo.org/739042
11 Package-Manager: Portage-3.0.6, Repoman-3.0.1
12 Signed-off-by: Vadim Misbakh-Soloviov <mva <AT> gentoo.org>
13
14 sys-cluster/ceph/ceph-15.2.4-r3.ebuild | 1 +
15 sys-cluster/ceph/ceph-15.2.5-r1.ebuild | 1 +
16 sys-cluster/ceph/files/ceph-15.2.5-glibc-2.32.patch | 15 +++++++++++++++
17 3 files changed, 17 insertions(+)
18
19 diff --git a/sys-cluster/ceph/ceph-15.2.4-r3.ebuild b/sys-cluster/ceph/ceph-15.2.4-r3.ebuild
20 index d3903349156..5a32d2f3787 100644
21 --- a/sys-cluster/ceph/ceph-15.2.4-r3.ebuild
22 +++ b/sys-cluster/ceph/ceph-15.2.4-r3.ebuild
23 @@ -199,6 +199,7 @@ PATCHES=(
24 "${FILESDIR}/ceph-15.2.3-spdk-compile.patch"
25 "${FILESDIR}/ceph-14.2.10-python-warnings.patch"
26 "${FILESDIR}/ceph-15.2.4-system-uring.patch"
27 + "${FILESDIR}/ceph-15.2.5-glibc-2.32.patch"
28 )
29
30 check-reqs_export_vars() {
31
32 diff --git a/sys-cluster/ceph/ceph-15.2.5-r1.ebuild b/sys-cluster/ceph/ceph-15.2.5-r1.ebuild
33 index e86923bb252..ace42c44650 100644
34 --- a/sys-cluster/ceph/ceph-15.2.5-r1.ebuild
35 +++ b/sys-cluster/ceph/ceph-15.2.5-r1.ebuild
36 @@ -201,6 +201,7 @@ PATCHES=(
37 "${FILESDIR}/ceph-15.2.4-system-uring.patch"
38 "${FILESDIR}/ceph-15.2.5-missing-includes.patch"
39 "${FILESDIR}/ceph-15.2.5-systemd-unit-fix.patch"
40 + "${FILESDIR}/ceph-15.2.5-glibc-2.32.patch"
41 )
42
43 check-reqs_export_vars() {
44
45 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
46 new file mode 100644
47 index 00000000000..f8f7fad8b65
48 --- /dev/null
49 +++ b/sys-cluster/ceph/files/ceph-15.2.5-glibc-2.32.patch
50 @@ -0,0 +1,15 @@
51 +diff -NaurBwdp a/src/global/signal_handler.h src/global/b/signal_handler.h
52 +--- a/src/global/signal_handler.h 2020-10-01 03:15:48.208164979 +0700
53 ++++ b/src/global/signal_handler.h 2020-10-01 03:15:40.655244081 +0700
54 +@@ -20,11 +20,7 @@
55 +
56 + typedef void (*signal_handler_t)(int);
57 +
58 +-#ifndef HAVE_REENTRANT_STRSIGNAL
59 +-# define sig_str(signum) sys_siglist[signum]
60 +-#else
61 + # define sig_str(signum) strsignal(signum)
62 +-#endif
63 +
64 + void install_sighandler(int signum, signal_handler_t handler, int flags);
65 +