1 |
commit: d6b79ed69027be967e705cc4ab3116dbc539f69a |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Dec 23 08:12:35 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Dec 23 08:13:46 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6b79ed6 |
7 |
|
8 |
app-admin/sud: fix build on musl |
9 |
|
10 |
Closes: https://bugs.gentoo.org/713470 |
11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
12 |
|
13 |
app-admin/sud/files/sud-1.3-use-system-queue.patch | 68 ++++++++++++++++++++++ |
14 |
app-admin/sud/sud-1.3-r1.ebuild | 12 +++- |
15 |
2 files changed, 77 insertions(+), 3 deletions(-) |
16 |
|
17 |
diff --git a/app-admin/sud/files/sud-1.3-use-system-queue.patch b/app-admin/sud/files/sud-1.3-use-system-queue.patch |
18 |
new file mode 100644 |
19 |
index 000000000000..c36b359d76ef |
20 |
--- /dev/null |
21 |
+++ b/app-admin/sud/files/sud-1.3-use-system-queue.patch |
22 |
@@ -0,0 +1,68 @@ |
23 |
+https://bugs.gentoo.org/713470 |
24 |
+ |
25 |
+--- a/sud/Makefile.am |
26 |
++++ b/sud/Makefile.am |
27 |
+@@ -1,7 +1,7 @@ |
28 |
+ AM_YFLAGS = -d |
29 |
+ |
30 |
+ sbin_PROGRAMS = sud |
31 |
+-sud_SOURCES = conf.c conf_parser.y conf_lexer.l interactive.c noninteractive.c control.c main.c popen.c request.c session.c service.c utility.c extern.h conf.h control.h queue.h session.h |
32 |
++sud_SOURCES = conf.c conf_parser.y conf_lexer.l interactive.c noninteractive.c control.c main.c popen.c request.c session.c service.c utility.c extern.h conf.h control.h session.h |
33 |
+ sud_CFLAGS = -Wall -DYY_NO_UNPUT |
34 |
+ |
35 |
+ #INCLUDES = -I.. |
36 |
+--- a/sud/conf.h |
37 |
++++ b/sud/conf.h |
38 |
+@@ -31,7 +31,7 @@ |
39 |
+ #include <sys/types.h> |
40 |
+ #include <grp.h> |
41 |
+ |
42 |
+-#include "queue.h" |
43 |
++#include <sys/queue.h> |
44 |
+ /* |
45 |
+ * XXX: have* variables are oversized, perhaps these could be implemented using |
46 |
+ * for example gid_t negative values |
47 |
+--- a/sud/conf_lexer.c |
48 |
++++ b/sud/conf_lexer.c |
49 |
+@@ -537,7 +537,7 @@ char *yytext; |
50 |
+ #include "conf.h" |
51 |
+ #include "conf_parser.h" |
52 |
+ #include "extern.h" |
53 |
+-#include "queue.h" |
54 |
++#include <sys/queue.h> |
55 |
+ |
56 |
+ extern int nline; |
57 |
+ |
58 |
+--- a/sud/conf_lexer.l |
59 |
++++ b/sud/conf_lexer.l |
60 |
+@@ -40,7 +40,7 @@ |
61 |
+ #include "conf.h" |
62 |
+ #include "conf_parser.h" |
63 |
+ #include "extern.h" |
64 |
+-#include "queue.h" |
65 |
++#include <sys/queue.h> |
66 |
+ |
67 |
+ extern int nline; |
68 |
+ |
69 |
+--- a/sud/service.c |
70 |
++++ b/sud/service.c |
71 |
+@@ -47,7 +47,7 @@ |
72 |
+ |
73 |
+ #include "conf.h" |
74 |
+ #include "extern.h" |
75 |
+-#include "queue.h" |
76 |
++#include <sys/queue.h> |
77 |
+ #include "session.h" |
78 |
+ |
79 |
+ |
80 |
+--- a/sud/session.h |
81 |
++++ b/sud/session.h |
82 |
+@@ -32,7 +32,7 @@ |
83 |
+ |
84 |
+ #include <unistd.h> |
85 |
+ |
86 |
+-#include "queue.h" |
87 |
++#include <sys/queue.h> |
88 |
+ |
89 |
+ |
90 |
+ struct sctl { |
91 |
|
92 |
diff --git a/app-admin/sud/sud-1.3-r1.ebuild b/app-admin/sud/sud-1.3-r1.ebuild |
93 |
index 7c72435d9c4d..0690a89921ef 100644 |
94 |
--- a/app-admin/sud/sud-1.3-r1.ebuild |
95 |
+++ b/app-admin/sud/sud-1.3-r1.ebuild |
96 |
@@ -1,4 +1,4 @@ |
97 |
-# Copyright 1999-2017 Gentoo Foundation |
98 |
+# Copyright 1999-2021 Gentoo Authors |
99 |
# Distributed under the terms of the GNU General Public License v2 |
100 |
|
101 |
EAPI=6 |
102 |
@@ -12,12 +12,18 @@ SRC_URI="http://s0ftpj.org/projects/sud/${P}.tar.gz" |
103 |
LICENSE="BSD" |
104 |
SLOT="0" |
105 |
KEYWORDS="~amd64 ~ppc ~x86" |
106 |
-IUSE="" |
107 |
|
108 |
-PATCHES=( "${FILESDIR}"/${PN}-1.3-fix-build-system.patch ) |
109 |
+DEPEND="elibc_musl? ( sys-libs/queue-standalone )" |
110 |
+ |
111 |
+PATCHES=( |
112 |
+ "${FILESDIR}"/${PN}-1.3-fix-build-system.patch |
113 |
+ "${FILESDIR}"/${PN}-1.3-use-system-queue.patch |
114 |
+) |
115 |
|
116 |
src_prepare() { |
117 |
default |
118 |
+ |
119 |
+ rm sud/queue.h || die |
120 |
eautoreconf |
121 |
} |