Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/rdma-core/, sys-cluster/rdma-core/files/
Date: Sat, 29 Jan 2022 11:02:37
Message-Id: 1643454138.59c64f758812d6989adc97939863b41178e48348.soap@gentoo
1 commit: 59c64f758812d6989adc97939863b41178e48348
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 29 11:02:18 2022 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 29 11:02:18 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59c64f75
7
8 sys-cluster/rdma-core: fix build on musl
9
10 Closes: https://bugs.gentoo.org/828894
11 Signed-off-by: David Seifert <soap <AT> gentoo.org>
12
13 .../rdma-core/files/rdma-core-38.0-musl.patch | 30 ++++++++++++++++++++++
14 sys-cluster/rdma-core/rdma-core-38.0.ebuild | 2 ++
15 2 files changed, 32 insertions(+)
16
17 diff --git a/sys-cluster/rdma-core/files/rdma-core-38.0-musl.patch b/sys-cluster/rdma-core/files/rdma-core-38.0-musl.patch
18 new file mode 100644
19 index 000000000000..b3f92bfaa1a3
20 --- /dev/null
21 +++ b/sys-cluster/rdma-core/files/rdma-core-38.0-musl.patch
22 @@ -0,0 +1,30 @@
23 +From cf11c3d888ae49374ed2d4871560c82e4639b85b Mon Sep 17 00:00:00 2001
24 +From: David Seifert <soap@g.o>
25 +Date: Sat, 29 Jan 2022 11:57:38 +0100
26 +Subject: [PATCH] Do not use `__THROW` in prototypes
27 +
28 +`__THROW` is a glibc-internal macro, as indicated by the
29 +preceding double underscore. The absence of this macro breaks
30 +builds on musl.
31 +
32 +Bug: https://bugs.gentoo.org/828894
33 +---
34 + libibverbs/neigh.c | 2 +-
35 + 1 file changed, 1 insertion(+), 1 deletion(-)
36 +
37 +diff --git a/libibverbs/neigh.c b/libibverbs/neigh.c
38 +index fa3cbf57..7eed95f1 100644
39 +--- a/libibverbs/neigh.c
40 ++++ b/libibverbs/neigh.c
41 +@@ -30,7 +30,7 @@
42 + #if !HAVE_WORKING_IF_H
43 + /* We need this decl from net/if.h but old systems do not let use co-include
44 + net/if.h and netlink/route/link.h */
45 +-extern unsigned int if_nametoindex(__const char *__ifname) __THROW;
46 ++extern unsigned int if_nametoindex(__const char *__ifname);
47 + #endif
48 +
49 + /* for PFX */
50 +--
51 +2.35.0
52 +
53
54 diff --git a/sys-cluster/rdma-core/rdma-core-38.0.ebuild b/sys-cluster/rdma-core/rdma-core-38.0.ebuild
55 index d25ddc3d8951..413f2aac21ed 100644
56 --- a/sys-cluster/rdma-core/rdma-core-38.0.ebuild
57 +++ b/sys-cluster/rdma-core/rdma-core-38.0.ebuild
58 @@ -56,6 +56,8 @@ RDEPEND="${COMMON_DEPEND}
59
60 BDEPEND="virtual/pkgconfig"
61
62 +PATCHES=( "${FILESDIR}"/${P}-musl.patch )
63 +
64 pkg_setup() {
65 use python && python-single-r1_pkg_setup