All of lore.kernel.org
 help / color / mirror / Atom feed
From: Khem Raj <raj.khem@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 6/8] pulseaudio: Fix build with glibc 2.27
Date: Sun, 28 Jan 2018 19:27:17 -0800	[thread overview]
Message-ID: <c8ef3f50b9b2931733970d039e08e3fcd3fa04e9.1517196242.git.raj.khem@gmail.com> (raw)
In-Reply-To: <cover.1517196242.git.raj.khem@gmail.com>

memfd_create is now available in glibc

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...-Check-if-memfd_create-is-already-defined.patch | 62 ++++++++++++++++++++++
 .../pulseaudio/pulseaudio_11.1.bb                  |  3 +-
 2 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio/0001-build-sys-Check-if-memfd_create-is-already-defined.patch

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"
 
-- 
2.16.1



  parent reply	other threads:[~2018-01-29  3:27 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-29  3:27 [PATCH 0/8] Update to binutils 2.30, glibc 2.27 initiated fixes, musl update Khem Raj
2018-01-29  3:27 ` [PATCH 1/8] gcc-7.3: Drop upstreamed musl cpuinfo patch Khem Raj
2018-01-29  3:27 ` [PATCH 2/8] make: Backport fixes to not assume glibc internal glob implementation Khem Raj
2018-01-29  3:27 ` [PATCH 3/8] perl: Undefine d_libm_lib_version Khem Raj
2018-01-29  3:27 ` [PATCH 4/8] e2fsprogs: 1.43.7 -> 1.43.8 Khem Raj
2018-01-29  3:27 ` [PATCH 5/8] systemd: Fix build with glibc 2.27 Khem Raj
2018-01-29  3:27 ` Khem Raj [this message]
2018-01-29  3:27 ` [PATCH 7/8] musl: Update to latest master Khem Raj
2018-01-29  3:27 ` [PATCH 8/8] binutils: Upgrade to 2.30 release Khem Raj
2018-01-29  3:34 ` ✗ patchtest: failure for Update to binutils 2.30, glibc 2.27 initiated fixes, musl update Patchwork
2018-01-29  4:44   ` Khem Raj

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=c8ef3f50b9b2931733970d039e08e3fcd3fa04e9.1517196242.git.raj.khem@gmail.com \
    --to=raj.khem@gmail.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.