1 |
commit: 3b77983e37c3c7b787b3408cd084cfb91ba423a3 |
2 |
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Feb 5 07:40:07 2022 +0000 |
4 |
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 5 07:44:24 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b77983e |
7 |
|
8 |
media-radio/tlf: Fix musl build errors |
9 |
|
10 |
Closes: https://bugs.gentoo.org/832234 |
11 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
12 |
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org> |
13 |
|
14 |
media-radio/tlf/files/tlf-1.4.1-musl.patch | 12 ++++++++++++ |
15 |
media-radio/tlf/tlf-1.4.1-r1.ebuild | 12 ++++++++---- |
16 |
2 files changed, 20 insertions(+), 4 deletions(-) |
17 |
|
18 |
diff --git a/media-radio/tlf/files/tlf-1.4.1-musl.patch b/media-radio/tlf/files/tlf-1.4.1-musl.patch |
19 |
new file mode 100644 |
20 |
index 000000000000..a4903015011d |
21 |
--- /dev/null |
22 |
+++ b/media-radio/tlf/files/tlf-1.4.1-musl.patch |
23 |
@@ -0,0 +1,12 @@ |
24 |
+diff --git a/src/sockserv.c b/src/sockserv.c |
25 |
+index c25f0fb..647188f 100644 |
26 |
+--- a/src/sockserv.c |
27 |
++++ b/src/sockserv.c |
28 |
+@@ -31,6 +31,7 @@ |
29 |
+ #include <stdlib.h> |
30 |
+ #include <string.h> |
31 |
+ #include <unistd.h> |
32 |
++#include <sys/select.h> |
33 |
+ |
34 |
+ #include "sockserv.h" |
35 |
+ #include "tlf_curses.h" |
36 |
|
37 |
diff --git a/media-radio/tlf/tlf-1.4.1-r1.ebuild b/media-radio/tlf/tlf-1.4.1-r1.ebuild |
38 |
index 897ebe600935..c19feb243da0 100644 |
39 |
--- a/media-radio/tlf/tlf-1.4.1-r1.ebuild |
40 |
+++ b/media-radio/tlf/tlf-1.4.1-r1.ebuild |
41 |
@@ -1,4 +1,4 @@ |
42 |
-# Copyright 1999-2021 Gentoo Authors |
43 |
+# Copyright 1999-2022 Gentoo Authors |
44 |
# Distributed under the terms of the GNU General Public License v2 |
45 |
|
46 |
EAPI="7" |
47 |
@@ -20,23 +20,27 @@ RDEPEND="sys-libs/ncurses:= |
48 |
dev-libs/glib:2 |
49 |
media-libs/hamlib:= |
50 |
media-sound/sox |
51 |
- dev-libs/xmlrpc-c[curl]" |
52 |
+ dev-libs/xmlrpc-c[curl] |
53 |
+ elibc_musl? ( sys-libs/argp-standalone )" |
54 |
DEPEND=" |
55 |
${RDEPEND} |
56 |
test? ( dev-util/cmocka )" |
57 |
|
58 |
-PATCHES=( "${FILESDIR}"/${P}-zone_nr.patch ) |
59 |
+PATCHES=( "${FILESDIR}/${P}-zone_nr.patch" |
60 |
+ "${FILESDIR}/${P}-musl.patch" |
61 |
+ ) |
62 |
|
63 |
src_prepare() { |
64 |
if has_version '>=media-libs/hamlib-4.2' ; then |
65 |
sed -i -e "s/FILPATHLEN/HAMLIB_FILPATHLEN/g" "${S}"/src/sendqrg.c || die |
66 |
fi |
67 |
|
68 |
- eapply ${PATCHES} |
69 |
+ eapply ${PATCHES[@]} |
70 |
eapply_user |
71 |
} |
72 |
|
73 |
src_configure() { |
74 |
+ use elibc_musl && append-libs argp |
75 |
append-ldflags -L/usr/$(get_libdir)/hamlib |
76 |
econf --enable-fldigi-xmlrpc |
77 |
} |