Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fabric/libcxgb4/files/, sys-fabric/libcxgb4/
Date: Thu, 23 Dec 2021 08:14:06
Message-Id: 1640247225.cfad54a2df42ae0950abdc46285926ec405bf54c.sam@gentoo
1 commit: cfad54a2df42ae0950abdc46285926ec405bf54c
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 23 08:07:58 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 23 08:13:45 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfad54a2
7
8 sys-fabric/libcxgb4: fix build on musl
9
10 Closes: https://bugs.gentoo.org/713776
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 .../libcxgb4/files/libcxgb4-1.3.2-use-system-queue.patch | 12 ++++++++++++
14 sys-fabric/libcxgb4/libcxgb4-1.3.2.ebuild | 13 ++++++++++---
15 2 files changed, 22 insertions(+), 3 deletions(-)
16
17 diff --git a/sys-fabric/libcxgb4/files/libcxgb4-1.3.2-use-system-queue.patch b/sys-fabric/libcxgb4/files/libcxgb4-1.3.2-use-system-queue.patch
18 new file mode 100644
19 index 000000000000..3fa51a780d5d
20 --- /dev/null
21 +++ b/sys-fabric/libcxgb4/files/libcxgb4-1.3.2-use-system-queue.patch
22 @@ -0,0 +1,12 @@
23 +https://bugs.gentoo.org/713776
24 +--- a/src/libcxgb4.h
25 ++++ b/src/libcxgb4.h
26 +@@ -41,7 +41,7 @@
27 + #include <sys/time.h>
28 + #include <infiniband/driver.h>
29 + #include <infiniband/arch.h>
30 +-#include "queue.h"
31 ++#include <sys/queue.h>
32 + #include "t4.h"
33 +
34 + extern unsigned long c4iw_page_size;
35
36 diff --git a/sys-fabric/libcxgb4/libcxgb4-1.3.2.ebuild b/sys-fabric/libcxgb4/libcxgb4-1.3.2.ebuild
37 index b4a7f4de7ad5..d0061e91f3d6 100644
38 --- a/sys-fabric/libcxgb4/libcxgb4-1.3.2.ebuild
39 +++ b/sys-fabric/libcxgb4/libcxgb4-1.3.2.ebuild
40 @@ -8,16 +8,23 @@ OFED_RC="1"
41 OFED_RC_VER="1"
42 OFED_SUFFIX="1"
43
44 -inherit openib
45 +inherit epatch openib
46
47 DESCRIPTION="OpenIB - driver for Chelsio T4-based iWARP (RDMA over IP/ethernet)"
48 KEYWORDS="amd64 x86 ~amd64-linux"
49 IUSE=""
50
51 -DEPEND="sys-fabric/libibverbs:${SLOT}"
52 -RDEPEND="${DEPEND}"
53 +RDEPEND="sys-fabric/libibverbs:${SLOT}"
54 +DEPEND="${DEPEND}
55 + elibc_musl? ( sys-libs/queue-standalone )"
56 block_other_ofed_versions
57
58 +src_prepare() {
59 + # bug #713776
60 + epatch "${FILESDIR}"/${PN}-1.3.2-use-system-queue.patch
61 + rm src/queue.h || die
62 +}
63 +
64 src_configure() {
65 econf --disable-static
66 }