summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/pulseaudio
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-01-27 13:27:13 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-29 23:05:11 +0000
commit8f893588ff42db711763d0a8977b733df8389774 (patch)
tree51007b2b4fdb1bb1f41594ac6051a23fcfe7811e /meta/recipes-multimedia/pulseaudio
parent6c7f32bd8b27c4dd91c1ac20f091358982e9c275 (diff)
downloadopenembedded-core-contrib-8f893588ff42db711763d0a8977b733df8389774.tar.gz
openembedded-core-contrib-8f893588ff42db711763d0a8977b733df8389774.tar.bz2
openembedded-core-contrib-8f893588ff42db711763d0a8977b733df8389774.zip
pulseaudio: Fix build with glibc 2.27
memfd_create is now available in glibc Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta/recipes-multimedia/pulseaudio')
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio/0001-build-sys-Check-if-memfd_create-is-already-defined.patch62
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio_11.1.bb3
2 files changed, 64 insertions, 1 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-build-sys-Check-if-memfd_create-is-already-defined.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-build-sys-Check-if-memfd_create-is-already-defined.patch
new file mode 100644
index 0000000000..a02f7d505c
--- /dev/null
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-build-sys-Check-if-memfd_create-is-already-defined.patch
@@ -0,0 +1,62 @@
+From 185b3c0cdd564901133e530ddd30853f65151622 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 27 Jan 2018 13:14:03 -0800
+Subject: [PATCH] build-sys: Check if memfd_create is already defined
+
+glibc 2.27+ has introduced this function
+
+BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=104815
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+Upstream-Status: Submitted
+
+ configure.ac | 7 +++++++
+ src/pulsecore/memfd-wrappers.h | 4 ++--
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 77b5ff5..aa97944 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -603,6 +603,10 @@ AS_IF([test "x$enable_memfd" != "xno"],
+ AC_CHECK_DECL(SYS_memfd_create, [HAVE_MEMFD=1], [HAVE_MEMFD=0], [#include <sys/syscall.h>]),
+ [HAVE_MEMFD=0])
+
++AS_IF([test "x$enable_memfd" != "xno"],
++ AC_CHECK_FUNC(memfd_create, [HAVE_MEMFD_CREATE=1], [HAVE_MEMFD_CREATE=0], [#include <sys/mman.h>]),
++ [HAVE_MEMFD_CREATE=0])
++
+ AS_IF([test "x$enable_memfd" = "xyes" && test "x$HAVE_MEMFD" = "x0"],
+ [AC_MSG_ERROR([*** Your Linux kernel does not support memfd shared memory.
+ *** Use linux v3.17 or higher for such a feature.])])
+@@ -610,6 +614,9 @@ AS_IF([test "x$enable_memfd" = "xyes" && test "x$HAVE_MEMFD" = "x0"],
+ AC_SUBST(HAVE_MEMFD)
+ AM_CONDITIONAL([HAVE_MEMFD], [test "x$HAVE_MEMFD" = x1])
+ AS_IF([test "x$HAVE_MEMFD" = "x1"], AC_DEFINE([HAVE_MEMFD], 1, [Have memfd shared memory.]))
++AC_SUBST(HAVE_MEMFD_CREATE)
++AM_CONDITIONAL([HAVE_MEMFD_CREATE], [test "x$HAVE_MEMFD_CREATE" = x1])
++AS_IF([test "x$HAVE_MEMFD_CREATE" = "x1"], AC_DEFINE([HAVE_MEMFD_CREATE], 1, [Define to 1 if you have the `memfd_create` function.]))
+
+ #### X11 (optional) ####
+
+diff --git a/src/pulsecore/memfd-wrappers.h b/src/pulsecore/memfd-wrappers.h
+index 3bed9b2..87ed758 100644
+--- a/src/pulsecore/memfd-wrappers.h
++++ b/src/pulsecore/memfd-wrappers.h
+@@ -32,11 +32,11 @@
+ * defined in the kernel header file <linux/fcntl.h>, that file as
+ * a whole conflicts with the original glibc header <fnctl.h>.
+ */
+-
++#ifndef HAVE_MEMFD_CREATE
+ static inline int memfd_create(const char *name, unsigned int flags) {
+ return syscall(SYS_memfd_create, name, flags);
+ }
+-
++#endif
+ /* memfd_create(2) flags */
+
+ #ifndef MFD_CLOEXEC
+--
+2.16.1
+
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_11.1.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_11.1.bb
index a50b5a08ae..94278eb34e 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio_11.1.bb
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_11.1.bb
@@ -4,7 +4,8 @@ SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/${BP}.tar.xz \
file://0001-padsp-Make-it-compile-on-musl.patch \
file://0001-client-conf-Add-allow-autospawn-for-root.patch \
file://volatiles.04_pulse \
-"
+ file://0001-build-sys-Check-if-memfd_create-is-already-defined.patch \
+ "
SRC_URI[md5sum] = "390de38231d5cdd6b43ada8939eb74f1"
SRC_URI[sha256sum] = "f2521c525a77166189e3cb9169f75c2ee2b82fa3fcf9476024fbc2c3a6c9cd9e"