From 6caccb42b40614a03579c26e4724df2ee5b28b2e Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Wed, 18 Sep 2024 12:10:42 -0700 Subject: [PATCH 1/3] oss: include sys/filio.h for FIONBIO definition on Solaris MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes build failure on Solaris 11.4: ../src/modules/oss/oss-util.c: In function ‘pa_oss_open’: ../src/modules/oss/oss-util.c:93:19: error: ‘FIONBIO’ undeclared (first use in this function) 93 | if (ioctl(fd, FIONBIO, &nonblock_io) < 0) { | ^~~~~~~ Signed-off-by: Alan Coopersmith --- src/modules/oss/oss-util.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/modules/oss/oss-util.c b/src/modules/oss/oss-util.c index 80b6c8c63..5623c9ddc 100644 --- a/src/modules/oss/oss-util.c +++ b/src/modules/oss/oss-util.c @@ -31,6 +31,10 @@ #include #include +#ifdef HAVE_SYS_FILIO_H +#include +#endif + #include #include #include From d5df5e9c322c54be6f43b0dc7b6801948da78634 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Wed, 18 Sep 2024 13:33:16 -0700 Subject: [PATCH 2/3] meson: Avoid passing GNU linker arguments to Solaris linker Signed-off-by: Alan Coopersmith --- src/modules/meson.build | 2 +- src/pulse/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/meson.build b/src/modules/meson.build index 05267c93a..765a32358 100644 --- a/src/modules/meson.build +++ b/src/modules/meson.build @@ -305,7 +305,7 @@ all_modules += [ # FIXME: meson doesn't support multiple RPATH arguments currently rpath_dirs = join_paths(privlibdir) + ':' + join_paths(modlibexecdir) -if host_machine.system() != 'windows' and host_machine.system() != 'darwin' +if host_machine.system() != 'windows' and host_machine.system() != 'darwin' and host_machine.system() != 'sunos' no_undefined_args = ['-Wl,--no-undefined'] else no_undefined_args = [] diff --git a/src/pulse/meson.build b/src/pulse/meson.build index c132630f3..953504e06 100644 --- a/src/pulse/meson.build +++ b/src/pulse/meson.build @@ -70,7 +70,7 @@ if glib_dep.found() libpulse_headers += 'glib-mainloop.h' endif -if host_machine.system() != 'windows' and host_machine.system() != 'darwin' +if host_machine.system() != 'windows' and host_machine.system() != 'darwin' and host_machine.system() != 'sunos' run_target('update-map-file', command : [ join_paths(meson.source_root(), 'scripts/generate-map-file.sh'), 'map-file', 'libpulse.def', [ libpulse_headers, 'simple.h', join_paths(meson.build_root(), 'src', 'pulse', 'version.h') ] ]) From 0e852afce3f4de3c3f8a39a9bebb966a6a1af698 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Wed, 18 Sep 2024 14:11:47 -0700 Subject: [PATCH 3/3] module-gsettings: include signal.h for definition of kill() on Solaris MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes build failure with gcc-14 on Solaris 11.4: ../src/modules/gsettings/module-gsettings.c:95:9: error: implicit declaration of function ‘kill’ [-Wimplicit-function-declaration] 95 | kill(u->pid, SIGTERM); | ^~~~ Signed-off-by: Alan Coopersmith --- src/modules/gsettings/module-gsettings.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/gsettings/module-gsettings.c b/src/modules/gsettings/module-gsettings.c index 6cfac77bb..1500e7636 100644 --- a/src/modules/gsettings/module-gsettings.c +++ b/src/modules/gsettings/module-gsettings.c @@ -23,6 +23,7 @@ #include #include +#include #include #include