Patchwork [3/5] pulseaudio-0.9.23: Fix build on uclibc

login
register
mail settings
Submitter Khem Raj
Date Nov. 20, 2011, 5:50 p.m.
Message ID <0abcddc2e0bdf826919f7aee820f60fa64024177.1321811216.git.raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/15163/
State Accepted
Commit 05f50a9a69cca1f18bcd57a6deebe91be842289f
Headers show

Comments

Khem Raj - Nov. 20, 2011, 5:50 p.m.
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

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../pulseaudio-0.9.23/fix_bluez_build.patch        |   26 ++++++++++++++++++++
 .../pulseaudio/pulseaudio_0.9.23.bb                |    3 +-
 2 files changed, 28 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/fix_bluez_build.patch
Paul Menzel - Nov. 20, 2011, 9:20 p.m.
Am Sonntag, den 20.11.2011, 09:50 -0800 schrieb Khem Raj:
> 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
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  .../pulseaudio-0.9.23/fix_bluez_build.patch        |   26 ++++++++++++++++++++
>  .../pulseaudio/pulseaudio_0.9.23.bb                |    3 +-
>  2 files changed, 28 insertions(+), 1 deletions(-)
>  create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/fix_bluez_build.patch
> 
> 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 0000000..fbb22d7
> --- /dev/null
> +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/fix_bluez_build.patch
> @@ -0,0 +1,26 @@
> +using uClibc $(INTLLIBS) is not empty but set to -lintl
> +this means that AM_LIBADD wont be empty as well and hence
> +a missing space which otherwise works starts to show up as error
> +
> +| make[4]: *** No rule to make target `-lintl', needed by `libbluetooth-ipc.la'.  Stop.
> +| 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'
> +| make[3]: *** [all-recursive] Error 1
> +
> +We add missing space
> +
> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> +
> +Upstream-Status: Pending

It is committed upstream as far as I know.

[…]


Thanks,

Paul

Patch

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 0000000..fbb22d7
--- /dev/null
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/fix_bluez_build.patch
@@ -0,0 +1,26 @@ 
+using uClibc $(INTLLIBS) is not empty but set to -lintl
+this means that AM_LIBADD wont be empty as well and hence
+a missing space which otherwise works starts to show up as error
+
+| make[4]: *** No rule to make target `-lintl', needed by `libbluetooth-ipc.la'.  Stop.
+| 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'
+| make[3]: *** [all-recursive] Error 1
+
+We add missing space
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Pending
+Index: pulseaudio-0.9.23/src/Makefile.am
+===================================================================
+--- pulseaudio-0.9.23.orig/src/Makefile.am	2011-06-23 13:18:54.000000000 -0700
++++ pulseaudio-0.9.23/src/Makefile.am	2011-11-20 09:04:00.986917207 -0800
+@@ -1701,7 +1701,7 @@
+ 
+ libbluetooth_ipc_la_SOURCES = modules/bluetooth/ipc.c modules/bluetooth/ipc.h
+ libbluetooth_ipc_la_LDFLAGS = -avoid-version
+-libbluetooth_ipc_la_LIBADD = $(AM_LIBADD)libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
++libbluetooth_ipc_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
+ libbluetooth_ipc_la_CFLAGS = $(AM_CFLAGS)
+ BLUETOOTH_IPC_FILES = $(subst modules/bluetooth/,,$(libbluetooth_ipc_la_SOURCES)) rtp.h
+ 
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb
index 62832d9..e712cab 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 @@ 
 require pulseaudio.inc
 
-PR = "r7"
+PR = "r8"
 
 DEPENDS += "gdbm speex libxml-parser-perl-native"
 
@@ -12,6 +12,7 @@  SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${PV}.
   file://tls_m4.patch \
   file://configure_silent_rules.patch \
   file://volatiles.04_pulse \
+  file://fix_bluez_build.patch \
 "
 
 SRC_URI[md5sum] = "7391205a337d1e04a9ff38025f684034"