summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/alsa/alsa-lib/Check-if-wordexp-function-is-supported.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-multimedia/alsa/alsa-lib/Check-if-wordexp-function-is-supported.patch')
-rw-r--r--meta/recipes-multimedia/alsa/alsa-lib/Check-if-wordexp-function-is-supported.patch51
1 files changed, 0 insertions, 51 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-lib/Check-if-wordexp-function-is-supported.patch b/meta/recipes-multimedia/alsa/alsa-lib/Check-if-wordexp-function-is-supported.patch
deleted file mode 100644
index 795e48ab2e..0000000000
--- a/meta/recipes-multimedia/alsa/alsa-lib/Check-if-wordexp-function-is-supported.patch
+++ /dev/null
@@ -1,51 +0,0 @@
1From 3408f8e78776b12f131e433749721602f87e0a70 Mon Sep 17 00:00:00 2001
2From: "Hong H. Pham" <hong.pham@windriver.com>
3Date: Fri, 29 Aug 2014 17:13:55 +0300
4Subject: [PATCH] Check if wordexp function is supported
5
6eglibc could be configured to build without wordexp, so it is not enough
7to check if wordexp.h exists (the header file could be installed, but it's
8possible that the wordexp() function is not supported). An additional
9check if wordexp() is supported by the system C library is needed.
10
11Upstream-Status: Inappropriate [configuration]
12
13Signed-off-by: Hong H. Pham <hong.pham@windriver.com>
14Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
15---
16 configure.ac | 5 ++++-
17 src/userfile.c | 2 +-
18 2 files changed, 5 insertions(+), 2 deletions(-)
19
20diff --git a/configure.ac b/configure.ac
21index 9490d39..b08a90a 100644
22--- a/configure.ac
23+++ b/configure.ac
24@@ -295,7 +295,10 @@ fi
25 AC_SUBST(ALSA_DEPLIBS)
26
27 dnl Check for headers
28-AC_CHECK_HEADERS([wordexp.h endian.h sys/endian.h sys/shm.h])
29+AC_CHECK_HEADERS([wordexp.h endian.h sys/endian.h sys/shm.h],
30+ dnl Make sure wordexp is supported by the C library
31+ AC_CHECK_FUNCS([wordexp])
32+)
33
34 dnl Check for resmgr support...
35 AC_MSG_CHECKING(for resmgr support)
36diff --git a/src/userfile.c b/src/userfile.c
37index 72779da..e9d13e6 100644
38--- a/src/userfile.c
39+++ b/src/userfile.c
40@@ -32,7 +32,7 @@
41 * stores the first matchine one. The returned string is strdup'ed.
42 */
43
44-#ifdef HAVE_WORDEXP_H
45+#if (defined(HAVE_WORDEXP_H) && defined(HAVE_WORDEXP))
46 #include <wordexp.h>
47 #include <assert.h>
48 int snd_user_file(const char *file, char **result)
49--
502.6.4
51