we need libtool-host for pulseaudio to avoid relinking, which fails on uClibc-ng builds

4 files changed, 54 insertions, 2 deletions

diff --git a/package/pulseaudio/Makefile b/package/pulseaudio/Makefile
index 65d271f5b..21482524c 100644
--- a/package/pulseaudio/Makefile
+++ b/package/pulseaudio/Makefile
@@ -25,8 +25,9 @@ include $(ADK_TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,PULSEAUDIO,pulseaudio,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 TARGET_CPPFLAGS+=	-D_GNU_SOURCE -D_POSIX_SOURCE
-CONFIGURE_ARGS+=	--disable-systemd \
-			--disable-manpages \
+# use libtool from host directory
+AUTOTOOL_STYLE:=	autoreconf
+CONFIGURE_ARGS+=	--disable-manpages \
 			--disable-tests \
 			--disable-neon-opt \
 			--disable-x11 \
@@ -41,6 +42,7 @@ CONFIGURE_ARGS+=	--disable-systemd \
 			--disable-jack \
 			--disable-gconf \
 			--disable-udev \
+			--disable-rpath \
 			--disable-dbus \
 			--disable-hal-compat \
 			--without-caps \
diff --git a/package/pulseaudio/patches/patch-Makefile_am b/package/pulseaudio/patches/patch-Makefile_am
new file mode 100644
index 000000000..b1411d1b9
--- /dev/null
+++ b/package/pulseaudio/patches/patch-Makefile_am
@@ -0,0 +1,11 @@
+--- pulseaudio-6.0.orig/Makefile.am	2015-02-12 15:10:35.000000000 +0100
++++ pulseaudio-6.0/Makefile.am	2015-06-04 12:12:26.000000000 +0200
+@@ -37,7 +37,7 @@ EXTRA_DIST = \
+ 	src/daemon/.gitignore \
+ 	src/pulse/.gitignore
+ 
+-SUBDIRS = src doxygen man po
++SUBDIRS = src
+ 
+ MAINTAINERCLEANFILES =
+ noinst_DATA =
diff --git a/package/pulseaudio/patches/patch-Makefile_am.orig b/package/pulseaudio/patches/patch-Makefile_am.orig
new file mode 100644
index 000000000..b79da37a5
--- /dev/null
+++ b/package/pulseaudio/patches/patch-Makefile_am.orig
@@ -0,0 +1,11 @@
+--- pulseaudio-6.0.orig/Makefile.am	2015-02-12 15:10:35.000000000 +0100
++++ pulseaudio-6.0/Makefile.am	2015-06-04 12:07:44.000000000 +0200
+@@ -37,7 +37,7 @@ EXTRA_DIST = \
+ 	src/daemon/.gitignore \
+ 	src/pulse/.gitignore
+ 
+-SUBDIRS = src doxygen man po
++SUBDIRS = src doxygen man
+ 
+ MAINTAINERCLEANFILES =
+ noinst_DATA =
diff --git a/package/pulseaudio/patches/patch-configure_ac b/package/pulseaudio/patches/patch-configure_ac
new file mode 100644
index 000000000..2bae7b834
--- /dev/null
+++ b/package/pulseaudio/patches/patch-configure_ac
@@ -0,0 +1,28 @@
+--- pulseaudio-6.0.orig/configure.ac	2015-02-12 15:10:35.000000000 +0100
++++ pulseaudio-6.0/configure.ac	2015-06-04 12:20:45.000000000 +0200
+@@ -99,25 +99,8 @@ PKG_PROG_PKG_CONFIG
+ 
+ # gettext
+ 
+-if test "x$enable_nls" != "xno"; then
+-IT_PROG_INTLTOOL([0.35.0])
+-
+-AM_GNU_GETTEXT_VERSION([0.18.1])
+-AM_GNU_GETTEXT([external])
+-
+-GETTEXT_PACKAGE=pulseaudio
+-AC_SUBST([GETTEXT_PACKAGE])
+-AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
+-
+-pulselocaledir='${prefix}/${DATADIRNAME}/locale'
+-AX_DEFINE_DIR(PULSE_LOCALEDIR, pulselocaledir, [Gettext locale dir])
+-else
+-# workaround till an intltool m4 bug is fixed upstream
+-# (https://bugs.launchpad.net/intltool/+bug/904647)
+ USE_NLS=no
+ AC_SUBST(USE_NLS)
+-fi
+-
+ 
+ #### Determine host OS ####
+