[pulseaudio-commits] [Git][pulseaudio/pulseaudio][master] 3 commits: meson: fix builds on platorms without libsystemd

[Arun Raghavan]

Arun Raghavan pushed to branch master at PulseAudio / pulseaudio


Commits:
e64f8a5e by Alan Coopersmith at 2019-07-01T01:37:04Z
meson: fix builds on platorms without libsystemd

Without this, meson on Solaris exits with:
src/daemon/meson.build:138:15: ERROR: Unknown variable "systemd_dep".

Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

- - - - -
9901a26d by Alan Coopersmith at 2019-07-01T01:37:04Z
meson: check for sys/filio.h

Needed for FIONREAD on Solaris

Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

- - - - -
4be2625e by Alan Coopersmith at 2019-07-01T01:37:04Z
core-util: Use /proc/fd on Solaris as well in pa_close_all

Gets rid of > 65,000 unnecessary close() syscalls

Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

- - - - -


2 changed files:

- meson.build
- src/pulsecore/core-util.c


Changes:

=====================================
meson.build
=====================================
@@ -165,6 +165,7 @@ check_headers = [
   'sys/capability.h',
   'sys/eventfd.h',
   'sys/ioctl.h',
+  'sys/filio.h',
   'sys/mman.h',
   'sys/prctl.h',
   'sys/resource.h',
@@ -394,10 +395,10 @@ if libsystemd_dep.found()
   cdata.set('HAVE_SYSTEMD_DAEMON', 1)
   cdata.set('HAVE_SYSTEMD_LOGIN', 1)
   cdata.set('HAVE_SYSTEMD_JOURNAL', 1)
-  systemd_dep = dependency('systemd', required : get_option('systemd'))
-  if systemd_dep.found() and systemduserunitdir == ''
-    systemduserunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir')
-  endif
+endif
+systemd_dep = dependency('systemd', required : get_option('systemd'))
+if systemd_dep.found() and systemduserunitdir == ''
+  systemduserunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir')
 endif
 
 x11_dep = dependency('x11-xcb', required : get_option('x11'))


=====================================
src/pulsecore/core-util.c
=====================================
@@ -2553,7 +2553,7 @@ int pa_close_allv(const int except_fds[]) {
     struct rlimit rl;
     int maxfd, fd;
 
-#ifdef __linux__
+#if defined(__linux__) || defined(__sun)
     int saved_errno;
     DIR *d;
 



View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/compare/1cf6d2c62a39d2add5b45557057e9aa17fcc8e6e...4be2625ef8cc3270827e522efadc1fb78439410d

-- 
View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/compare/1cf6d2c62a39d2add5b45557057e9aa17fcc8e6e...4be2625ef8cc3270827e522efadc1fb78439410d
You're receiving this email because of your account on gitlab.freedesktop.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/pulseaudio-commits/attachments/20190701/3b94b378/attachment-0001.html>