git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

   1 From 0cb66c0c5aafd48b63a755860746e70afb332c8d Mon Sep 17 00:00:00 2001
   2 From: Tanu Kaskinen <tanuk@iki.fi>
   3 Date: Wed, 24 Jan 2018 03:51:49 +0200
   4 Subject: [PATCH] memfd-wrappers: only define memfd_create() if not already
   5  defined
   6
   7 glibc 2.27 is to be released soon, and it will provide memfd_create().
   8 If glibc provides the function, we must not define it ourselves,
   9 otherwise building fails due to conflict between the two implementations
  10 of the same function.
  11
  12 BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=104733
  13 ---
  14 Upstream-Status: Submitted [https://bugs.freedesktop.org/attachment.cgi?id=136927]
  15 Signed-off-by: Khem Raj <raj.khem@gmail.com>
  16
  17  configure.ac                   | 3 +++
  18  src/pulsecore/memfd-wrappers.h | 7 ++++---
  19  2 files changed, 7 insertions(+), 3 deletions(-)
  20
  21 diff --git a/configure.ac b/configure.ac
  22 index 77b5ff5..3a71fd8 100644
  23 --- a/configure.ac
  24 +++ b/configure.ac
  25 @@ -607,6 +607,9 @@ AS_IF([test "x$enable_memfd" = "xyes" && test "x$HAVE_MEMFD" = "x0"],
  26      [AC_MSG_ERROR([*** Your Linux kernel does not support memfd shared memory.
  27                    *** Use linux v3.17 or higher for such a feature.])])
  28
  29 +AS_IF([test "x$HAVE_MEMFD" = "x1"],
  30 +    AC_CHECK_FUNCS([memfd_create]))
  31 +
  32  AC_SUBST(HAVE_MEMFD)
  33  AM_CONDITIONAL([HAVE_MEMFD], [test "x$HAVE_MEMFD" = x1])
  34  AS_IF([test "x$HAVE_MEMFD" = "x1"], AC_DEFINE([HAVE_MEMFD], 1, [Have memfd shared memory.]))
  35 diff --git a/src/pulsecore/memfd-wrappers.h b/src/pulsecore/memfd-wrappers.h
  36 index 3bed9b2..c7aadfd 100644
  37 --- a/src/pulsecore/memfd-wrappers.h
  38 +++ b/src/pulsecore/memfd-wrappers.h
  39 @@ -20,13 +20,14 @@
  40    License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
  41  ***/
  42
  43 -#ifdef HAVE_MEMFD
  44 +#if defined(HAVE_MEMFD) && !defined(HAVE_MEMFD_CREATE)
  45
  46  #include <sys/syscall.h>
  47  #include <fcntl.h>
  48
  49  /*
  50 - * No glibc wrappers exist for memfd_create(2), so provide our own.
  51 + * Before glibc version 2.27 there was no wrapper for memfd_create(2),
  52 + * so we have to provide our own.
  53   *
  54   * Also define memfd fcntl sealing macros. While they are already
  55   * defined in the kernel header file <linux/fcntl.h>, that file as
  56 @@ -63,6 +64,6 @@ static inline int memfd_create(const char *name, unsigned int flags) {
  57  #define F_SEAL_WRITE    0x0008  /* prevent writes */
  58  #endif
  59
  60 -#endif /* HAVE_MEMFD */
  61 +#endif /* HAVE_MEMFD && !HAVE_MEMFD_CREATE */
  62
  63  #endif
  64 --
  65 2.16.1
  66