diff options
author | Khem Raj <raj.khem@gmail.com> | 2011-11-20 09:50:45 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-21 16:48:53 +0000 |
commit | a403e9b56b814d31c7f814e8ecf811effe1cd57a (patch) | |
tree | 35d4b3d59ffda2021df4d2a3d1f3c066c3c2ded1 /meta/recipes-multimedia | |
parent | 4c289c205174e2b7f9b5abb68a176708e7a8e83b (diff) | |
download | poky-a403e9b56b814d31c7f814e8ecf811effe1cd57a.tar.gz |
pulseaudio-0.9.23: Fix build on uclibc
Import patch from oe.dev rev 7c33f2e906a20e139d53b4f2d8fbc2773a4725b3
to fix bluez build when using uclibc
cgit link here
http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=7c33f2e906a20e139d53b4f2d8fbc2773a4725b3
(From OE-Core rev: 05f50a9a69cca1f18bcd57a6deebe91be842289f)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/fix_bluez_build.patch | 26 | ||||
-rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb | 3 |
2 files changed, 28 insertions, 1 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/fix_bluez_build.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/fix_bluez_build.patch new file mode 100644 index 0000000000..fbb22d77e0 --- /dev/null +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/fix_bluez_build.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | using uClibc $(INTLLIBS) is not empty but set to -lintl | ||
2 | this means that AM_LIBADD wont be empty as well and hence | ||
3 | a missing space which otherwise works starts to show up as error | ||
4 | |||
5 | | make[4]: *** No rule to make target `-lintl', needed by `libbluetooth-ipc.la'. Stop. | ||
6 | | make[4]: Leaving directory `/home/kraj/work/angstrom/sources/openembedded-core/build/tmp-uclibc/work/armv5te-oe-linux-uclibceabi/pulseaudio-0.9.23-r7/pulseaudio-0.9.23/src' | ||
7 | | make[3]: *** [all-recursive] Error 1 | ||
8 | |||
9 | We add missing space | ||
10 | |||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | |||
13 | Upstream-Status: Pending | ||
14 | Index: pulseaudio-0.9.23/src/Makefile.am | ||
15 | =================================================================== | ||
16 | --- pulseaudio-0.9.23.orig/src/Makefile.am 2011-06-23 13:18:54.000000000 -0700 | ||
17 | +++ pulseaudio-0.9.23/src/Makefile.am 2011-11-20 09:04:00.986917207 -0800 | ||
18 | @@ -1701,7 +1701,7 @@ | ||
19 | |||
20 | libbluetooth_ipc_la_SOURCES = modules/bluetooth/ipc.c modules/bluetooth/ipc.h | ||
21 | libbluetooth_ipc_la_LDFLAGS = -avoid-version | ||
22 | -libbluetooth_ipc_la_LIBADD = $(AM_LIBADD)libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la | ||
23 | +libbluetooth_ipc_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la | ||
24 | libbluetooth_ipc_la_CFLAGS = $(AM_CFLAGS) | ||
25 | BLUETOOTH_IPC_FILES = $(subst modules/bluetooth/,,$(libbluetooth_ipc_la_SOURCES)) rtp.h | ||
26 | |||
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb index 62832d9474..e712cabebd 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | require pulseaudio.inc | 1 | require pulseaudio.inc |
2 | 2 | ||
3 | PR = "r7" | 3 | PR = "r8" |
4 | 4 | ||
5 | DEPENDS += "gdbm speex libxml-parser-perl-native" | 5 | DEPENDS += "gdbm speex libxml-parser-perl-native" |
6 | 6 | ||
@@ -12,6 +12,7 @@ SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${PV}. | |||
12 | file://tls_m4.patch \ | 12 | file://tls_m4.patch \ |
13 | file://configure_silent_rules.patch \ | 13 | file://configure_silent_rules.patch \ |
14 | file://volatiles.04_pulse \ | 14 | file://volatiles.04_pulse \ |
15 | file://fix_bluez_build.patch \ | ||
15 | " | 16 | " |
16 | 17 | ||
17 | SRC_URI[md5sum] = "7391205a337d1e04a9ff38025f684034" | 18 | SRC_URI[md5sum] = "7391205a337d1e04a9ff38025f684034" |