Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/, net-libs/libbtbb/files/
Date: Thu, 01 Sep 2022 02:06:34
Message-Id: 1661997939.e0f44742d199c1806c2d1d6d0497f75fb65b2b9c.sam@gentoo
1 commit: e0f44742d199c1806c2d1d6d0497f75fb65b2b9c
2 Author: brahmajit das <listout <AT> protonmail <DOT> com>
3 AuthorDate: Tue Aug 23 20:42:53 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 1 02:05:39 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0f44742
7
8 net-libs/libbtbb: Fix unknown type u_char on musl
9
10 Build fails with error: unknown type name u_char
11
12 Closes: https://bugs.gentoo.org/829245
13 Closes: https://bugs.gentoo.org/715758
14 Signed-off-by: brahmajit das <listout <AT> protonmail.com>
15 Closes: https://github.com/gentoo/gentoo/pull/26549
16 Signed-off-by: Sam James <sam <AT> gentoo.org>
17
18 net-libs/libbtbb/files/libbtbb-2020.12.1-musl-u-char.patch | 14 ++++++++++++++
19 net-libs/libbtbb/libbtbb-2020.12.1-r1.ebuild | 4 ++++
20 2 files changed, 18 insertions(+)
21
22 diff --git a/net-libs/libbtbb/files/libbtbb-2020.12.1-musl-u-char.patch b/net-libs/libbtbb/files/libbtbb-2020.12.1-musl-u-char.patch
23 new file mode 100644
24 index 000000000000..7065e000477d
25 --- /dev/null
26 +++ b/net-libs/libbtbb/files/libbtbb-2020.12.1-musl-u-char.patch
27 @@ -0,0 +1,14 @@
28 +# Fix unknown type name 'u_char' on musl
29 +# Closes: https://bugs.gentoo.org/829245
30 +# Closes: https://bugs.gentoo.org/715758
31 +# Upstream PR: https://github.com/greatscottgadgets/libbtbb/pull/64
32 +--- a/lib/src/pcap.c
33 ++++ b/lib/src/pcap.c
34 +@@ -27,6 +27,7 @@
35 + #include <stdlib.h>
36 + #include <string.h>
37 + #include <assert.h>
38 ++#include <sys/types.h>
39 +
40 + typedef enum {
41 + PCAP_OK = 0,
42
43 diff --git a/net-libs/libbtbb/libbtbb-2020.12.1-r1.ebuild b/net-libs/libbtbb/libbtbb-2020.12.1-r1.ebuild
44 index c6a7e694e720..ccc78dfda1b0 100644
45 --- a/net-libs/libbtbb/libbtbb-2020.12.1-r1.ebuild
46 +++ b/net-libs/libbtbb/libbtbb-2020.12.1-r1.ebuild
47 @@ -23,6 +23,10 @@ LICENSE="GPL-2"
48 SLOT="0/${PV}"
49 IUSE="static-libs"
50
51 +PATCHES=(
52 + "${FILESDIR}"/${PN}-2020.12.1-musl-u-char.patch
53 +)
54 +
55 src_configure() {
56 local mycmakeargs=(
57 -DENABLE_PYTHON=OFF