summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Zhang <sen.zhang@windriver.com>2013-06-17 12:23:18 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-18 17:33:15 +0100
commit609a3671a9aec7a02a99f84e1082961771ce2fef (patch)
tree5680c0a462dd85ad803e7fea65e8a875aeeeb7ab
parenta40435e3397137205e169260b4463a19b5071b41 (diff)
downloadpoky-609a3671a9aec7a02a99f84e1082961771ce2fef.tar.gz
alsa-lib: check if wordexp is supported in libc
eglibc could be configured to build without the wordexp feature. To ensure that the wordexp feature could be used, the configure script must check if wordexp() is supported in libc in addition to checking if wordexp.h exists. (From OE-Core rev: 3c3fe1d139fc84d7ff125f87a4692fac6dfc04e6) Signed-off-by: Hong H. Pham <hong.pham@windriver.com> Signed-off-by: Jesse Zhang <sen.zhang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/alsa/alsa-lib/Check-if-wordexp-function-is-supported.patch50
-rw-r--r--meta/recipes-multimedia/alsa/alsa-lib_1.0.26.bb1
2 files changed, 51 insertions, 0 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
new file mode 100644
index 0000000000..41b3c23a40
--- /dev/null
+++ b/meta/recipes-multimedia/alsa/alsa-lib/Check-if-wordexp-function-is-supported.patch
@@ -0,0 +1,50 @@
1From 2555c5d62229cf269974f6ec6e4689ab97bbda42 Mon Sep 17 00:00:00 2001
2From: "Hong H. Pham" <hong.pham@windriver.com>
3Date: Tue, 26 Feb 2013 19:40:04 -0500
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: Pending
12
13Signed-off-by: Hong H. Pham <hong.pham@windriver.com>
14---
15 configure.in | 5 ++++-
16 src/userfile.c | 2 +-
17 2 files changed, 5 insertions(+), 2 deletions(-)
18
19diff --git a/configure.in b/configure.in
20index 4bcb0d6..ba1c2dd 100644
21--- a/configure.in
22+++ b/configure.in
23@@ -333,7 +333,10 @@ arm*)
24 esac
25
26 dnl Check for wordexp.h
27-AC_CHECK_HEADERS([wordexp.h])
28+AC_CHECK_HEADERS([wordexp.h],
29+ dnl Make sure wordexp is supported by the C library
30+ AC_CHECK_FUNCS([wordexp])
31+)
32
33 dnl Check for resmgr support...
34 AC_MSG_CHECKING(for resmgr support)
35diff --git a/src/userfile.c b/src/userfile.c
36index 3a73836..b8ce809 100644
37--- a/src/userfile.c
38+++ b/src/userfile.c
39@@ -32,7 +32,7 @@
40 * stores the first matchine one. The returned string is strdup'ed.
41 */
42
43-#ifdef HAVE_WORDEXP_H
44+#if (defined(HAVE_WORDEXP_H) && defined(HAVE_WORDEXP))
45 #include <wordexp.h>
46 #include <assert.h>
47 int snd_user_file(const char *file, char **result)
48--
491.7.10.4
50
diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.0.26.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.0.26.bb
index 2695e6b7a2..6f22d06c03 100644
--- a/meta/recipes-multimedia/alsa/alsa-lib_1.0.26.bb
+++ b/meta/recipes-multimedia/alsa/alsa-lib_1.0.26.bb
@@ -20,6 +20,7 @@ SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \
20 file://fix-tstamp-declaration.patch \ 20 file://fix-tstamp-declaration.patch \
21 file://obsolete_automake_macros.patch \ 21 file://obsolete_automake_macros.patch \
22 file://fix-O0-Optimize-unable-inline-function.patch \ 22 file://fix-O0-Optimize-unable-inline-function.patch \
23 file://Check-if-wordexp-function-is-supported.patch \
23 " 24 "
24SRC_URI[md5sum] = "2dfa35d28471d721e592b616beedf965" 25SRC_URI[md5sum] = "2dfa35d28471d721e592b616beedf965"
25SRC_URI[sha256sum] = "8c9f8161603cc3db640619650401292c3e110da63429ab6938aac763319f6e7d" 26SRC_URI[sha256sum] = "8c9f8161603cc3db640619650401292c3e110da63429ab6938aac763319f6e7d"