summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiteo <riteo@posteo.net>2023-01-23 20:25:12 +0100
committerRiteo <riteo@posteo.net>2023-01-23 20:31:22 +0100
commitacb78384d8728d5c3270904bb14257c7a56e8820 (patch)
tree3851782f3d25f77533c2c0653d572384ff605cbc
parentc06df6779ae8c3145cd7be727102663ccae568e9 (diff)
Fix builtin alsa headers building on musl
For some reason it doesn't use the POSIX `poll.h`, instead resorting to `sys/poll.h`. Musl doesn't really like this at all, throwing a warning and, thus, halting compilation.
-rw-r--r--thirdparty/linuxbsd_headers/README.md1
-rw-r--r--thirdparty/linuxbsd_headers/alsa/asoundlib.h2
-rw-r--r--thirdparty/linuxbsd_headers/alsa/patches/use-standard-poll-h.diff11
3 files changed, 13 insertions, 1 deletions
diff --git a/thirdparty/linuxbsd_headers/README.md b/thirdparty/linuxbsd_headers/README.md
index 450c0e78aa..af902aa97a 100644
--- a/thirdparty/linuxbsd_headers/README.md
+++ b/thirdparty/linuxbsd_headers/README.md
@@ -11,6 +11,7 @@ readability.
- Version: 1.1.3-5
- License: LPGL-2.1+
+Patches in the `patches` directory should be re-applied after updates.
## dbus
diff --git a/thirdparty/linuxbsd_headers/alsa/asoundlib.h b/thirdparty/linuxbsd_headers/alsa/asoundlib.h
index 3c2766e325..a546194382 100644
--- a/thirdparty/linuxbsd_headers/alsa/asoundlib.h
+++ b/thirdparty/linuxbsd_headers/alsa/asoundlib.h
@@ -35,7 +35,7 @@
#include <string.h>
#include <fcntl.h>
#include <assert.h>
-#include <sys/poll.h>
+#include <poll.h>
#include <errno.h>
#include <stdarg.h>
#include <endian.h>
diff --git a/thirdparty/linuxbsd_headers/alsa/patches/use-standard-poll-h.diff b/thirdparty/linuxbsd_headers/alsa/patches/use-standard-poll-h.diff
new file mode 100644
index 0000000000..8d536df579
--- /dev/null
+++ b/thirdparty/linuxbsd_headers/alsa/patches/use-standard-poll-h.diff
@@ -0,0 +1,11 @@
+--- a/asoundlib.h
++++ b/asoundlib.h
+@@ -35,7 +35,7 @@
+ #include <string.h>
+ #include <fcntl.h>
+ #include <assert.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ #include <errno.h>
+ #include <stdarg.h>
+ #include <endian.h>