gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

media-libs/alsa-lib: fix build on musl

Browse Source 
Closes: https://bugs.gentoo.org/967250
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
This commit is contained in:
Mike Gilbert
2025-12-09 12:52:42 -05:00
parent 729c57ca97
commit e11cefa0a9
2 changed files with 98 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
media-libs/alsa-lib/alsa-lib-1.2.15.ebuild → media-libs/alsa-lib/alsa-lib-1.2.15-r1.ebuild
View File

@@ -34,6 +34,7 @@ BDEPEND="doc? ( >=app-text/doxygen-1.2.6 )"
PATCHES=(
"${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422
"${FILESDIR}/alsa-lib-1.2.15-closefrom.patch"
)
pkg_setup() {

97
media-libs/alsa-lib/files/alsa-lib-1.2.15-closefrom.patch Normal file
View File

@@ -0,0 +1,97 @@
https://bugs.gentoo.org/967250
https://github.com/alsa-project/alsa-lib/pull/486
From a068cf08ad67447893b707cddfce31c9cafee643 Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym@gentoo.org>
Date: Mon, 8 Dec 2025 23:46:17 -0500
Subject: [PATCH] ucm: use closefrom instead of close_range
closefrom is a library function with a fallback mechanism for when the
kernel does not support the close_range syscall.
Also check for the function properly instead of assuming it is available
with _GNU_SOURCE defined.
Closes: https://github.com/alsa-project/alsa-lib/pull/486
Fixes: https://github.com/alsa-project/alsa-lib/issues/485
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
configure.ac | 1 +
src/ucm/ucm_exec.c | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 8f4bd0de1..f4862f64c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,6 +52,7 @@ dnl Checks for library functions.
AC_PROG_GCC_TRADITIONAL
AC_CHECK_FUNCS([uselocale])
AC_CHECK_FUNCS([eaccess])
+AC_CHECK_DECLS([closefrom])
dnl Enable largefile support
AC_SYS_LARGEFILE
diff --git a/src/ucm/ucm_exec.c b/src/ucm/ucm_exec.c
index b5a22023b..713039b49 100644
--- a/src/ucm/ucm_exec.c
+++ b/src/ucm/ucm_exec.c
@@ -259,8 +259,8 @@ int uc_mgr_exec(const char *prog)
close(f);
-#if defined(_GNU_SOURCE)
- close_range(3, maxfd, 0);
+#if HAVE_DECL_CLOSEFROM
+ closefrom(3);
#else
for (f = 3; f < maxfd; f++)
close(f);
From 813ffe34ff6c720dcc56e4549338bf9e9184af1f Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 9 Dec 2025 17:48:34 +0100
Subject: [PATCH] ucm: exec - fix maxfd used warning
Fixes: a068cf08 ("ucm: use closefrom instead of close_range")
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
src/ucm/ucm_exec.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/ucm/ucm_exec.c b/src/ucm/ucm_exec.c
index 713039b4..c16a4cfd 100644
--- a/src/ucm/ucm_exec.c
+++ b/src/ucm/ucm_exec.c
@@ -183,7 +183,7 @@ static int parse_args(char ***argv, int argc, const char *cmd)
*/
int uc_mgr_exec(const char *prog)
{
- pid_t p, f, maxfd;
+ pid_t p, f;
int err = 0, status;
char bin[PATH_MAX];
struct sigaction sa;
@@ -212,8 +212,6 @@ int uc_mgr_exec(const char *prog)
prog = bin;
}
- maxfd = sysconf(_SC_OPEN_MAX);
-
/*
* block SIGCHLD signal
* ignore SIGINT and SIGQUIT in parent
@@ -262,8 +260,11 @@ int uc_mgr_exec(const char *prog)
#if HAVE_DECL_CLOSEFROM
closefrom(3);
#else
- for (f = 3; f < maxfd; f++)
- close(f);
+ {
+ pid_t maxfd = sysconf(_SC_OPEN_MAX);
+ for (f = 3; f < maxfd; f++)
+ close(f);
+ }
#endif
/* install default handlers for the forked process */