diff options
| author |   Sam James <sam@gentoo.org> | 2021-12-23 08:12:35 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-12-23 08:13:46 +0000 |
| commit | d6b79ed69027be967e705cc4ab3116dbc539f69a (patch) | |
| tree | 895f21ac4343e671d1f309922da72831a71b125a /app-admin | |
| parent | sys-fabric/libcxgb4: fix build on musl (diff) | |
| download | gentoo-d6b79ed69027be967e705cc4ab3116dbc539f69a.tar.gz gentoo-d6b79ed69027be967e705cc4ab3116dbc539f69a.tar.bz2 gentoo-d6b79ed69027be967e705cc4ab3116dbc539f69a.zip | |
app-admin/sud: fix build on musl
Closes: https://bugs.gentoo.org/713470
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/sud/files/sud-1.3-use-system-queue.patch | 68 | ||||
| -rw-r--r-- | app-admin/sud/sud-1.3-r1.ebuild | 12 |
2 files changed, 77 insertions, 3 deletions
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 new file mode 100644 index 000000000000..c36b359d76ef --- /dev/null +++ b/app-admin/sud/files/sud-1.3-use-system-queue.patch @@ -0,0 +1,68 @@ +https://bugs.gentoo.org/713470 + +--- a/sud/Makefile.am ++++ b/sud/Makefile.am +@@ -1,7 +1,7 @@ + AM_YFLAGS = -d + + sbin_PROGRAMS = sud +-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 ++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 + sud_CFLAGS = -Wall -DYY_NO_UNPUT + + #INCLUDES = -I.. +--- a/sud/conf.h ++++ b/sud/conf.h +@@ -31,7 +31,7 @@ + #include <sys/types.h> + #include <grp.h> + +-#include "queue.h" ++#include <sys/queue.h> + /* + * XXX: have* variables are oversized, perhaps these could be implemented using + * for example gid_t negative values +--- a/sud/conf_lexer.c ++++ b/sud/conf_lexer.c +@@ -537,7 +537,7 @@ char *yytext; + #include "conf.h" + #include "conf_parser.h" + #include "extern.h" +-#include "queue.h" ++#include <sys/queue.h> + + extern int nline; + +--- a/sud/conf_lexer.l ++++ b/sud/conf_lexer.l +@@ -40,7 +40,7 @@ + #include "conf.h" + #include "conf_parser.h" + #include "extern.h" +-#include "queue.h" ++#include <sys/queue.h> + + extern int nline; + +--- a/sud/service.c ++++ b/sud/service.c +@@ -47,7 +47,7 @@ + + #include "conf.h" + #include "extern.h" +-#include "queue.h" ++#include <sys/queue.h> + #include "session.h" + + +--- a/sud/session.h ++++ b/sud/session.h +@@ -32,7 +32,7 @@ + + #include <unistd.h> + +-#include "queue.h" ++#include <sys/queue.h> + + + struct sctl { diff --git a/app-admin/sud/sud-1.3-r1.ebuild b/app-admin/sud/sud-1.3-r1.ebuild index 7c72435d9c4d..0690a89921ef 100644 --- a/app-admin/sud/sud-1.3-r1.ebuild +++ b/app-admin/sud/sud-1.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,12 +12,18 @@ SRC_URI="http://s0ftpj.org/projects/sud/${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" -PATCHES=( "${FILESDIR}"/${PN}-1.3-fix-build-system.patch ) +DEPEND="elibc_musl? ( sys-libs/queue-standalone )" + +PATCHES=( + "${FILESDIR}"/${PN}-1.3-fix-build-system.patch + "${FILESDIR}"/${PN}-1.3-use-system-queue.patch +) src_prepare() { default + + rm sud/queue.h || die eautoreconf } |