another musl fix round

10 files changed, 94 insertions, 37 deletions

diff --git a/package/bluez/Makefile b/package/bluez/Makefile
index d8a0b540f..ae89d6852 100644
--- a/package/bluez/Makefile
+++ b/package/bluez/Makefile
@@ -4,47 +4,34 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		bluez
-PKG_VERSION:=		4.101
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		fb42cb7038c380eb0e2fa208987c96ad
+PKG_VERSION:=		5.12
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		981b34c2ae7e2ed2e25a167d8a902a25
 PKG_DESCR:=		bluetooth applications
 PKG_SECTION:=		bluetooth
-PKG_DEPENDS:=		kmod-bt libbluetooth
+PKG_DEPENDS:=		kmod-bt glib dbus libreadline
+PKG_BUILDDEP:=		autotool glib dbus readline
 PKG_URL:=		http://www.bluez.org/
 PKG_SITES:=		http://mirror.anl.gov/pub/linux/bluetooth/
-PKG_LIBNAME:=		libbluetooth
 PKG_OPTS:=		dev
 
-PKG_SUBPKGS:=		BLUEZ LIBBLUETOOTH
-PKGSC_LIBBLUETOOTH:=	libs
-PKGSD_LIBBLUETOOTH:=	bluetooth libraries
-PKGSS_LIBBLUETOOTH:=	glib libusb dbus libusb-compat
-PKGSB_LIBBLUETOOTH:=	glib libusb dbus libusb-compat
-
 PKG_ARCH_DEPENDS:=	!avr32
 
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+=              libmix
-endif
-
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BLUEZ,bluez,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBBLUETOOTH,libbluetooth,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBBLUETOOTH},${PKGSD_LIBBLUETOOTH},${PKGSC_LIBBLUETOOTH},${PKG_OPTS}))
 
+AUTOTOOL_STYLE:=	autoreconf
 ifeq ($(ADK_STATIC),y)
 XAKE_FLAGS+=		CCLD="$(TARGET_CC) -all-static -pthread"
 endif
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
+TARGET_LDFLAGS+=	-lncurses
 CONFIGURE_ENV+=		ac_cv_prog_cc_pie=no
 CONFIGURE_ARGS+=	--enable-tools \
-			--enable-alsa \
-			--enable-usb \
-			--enable-bccmd \
-			--enable-hidd \
-			--enable-pand \
-			--enable-dund \
-			--enable-netlink \
+			--disable-udev \
+			--disable-systemd \
+			--disable-obex \
 			--disable-pie \
 			--disable-cups
 
@@ -52,16 +39,10 @@ bluez-install:
 	${INSTALL_DIR} $(IDIR_BLUEZ)/etc/dbus-1/system.d
 	${INSTALL_DIR} ${IDIR_BLUEZ}/usr/bin
 	${CP} ${WRKINST}/usr/bin/* ${IDIR_BLUEZ}/usr/bin
-	${INSTALL_DIR} ${IDIR_BLUEZ}/usr/sbin
-	${CP} ${WRKINST}/usr/sbin/* ${IDIR_BLUEZ}/usr/sbin
 	${INSTALL_DIR} ${IDIR_BLUEZ}/etc/bluetooth
 	$(INSTALL_DATA) ./files/main.conf \
 		${IDIR_BLUEZ}/etc/bluetooth
 	$(INSTALL_DATA) ./files/bluetooth.conf \
 		$(IDIR_BLUEZ)/etc/dbus-1/system.d
 
-libbluetooth-install:
-	${INSTALL_DIR} ${IDIR_LIBBLUETOOTH}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libbluetooth.so* ${IDIR_LIBBLUETOOTH}/usr/lib
-
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/bluez/patches/patch-Makefile_am b/package/bluez/patches/patch-Makefile_am
new file mode 100644
index 000000000..ab4c015af
--- /dev/null
+++ b/package/bluez/patches/patch-Makefile_am
@@ -0,0 +1,10 @@
+--- bluez-5.12.orig/Makefile.am	2013-12-10 07:59:06.000000000 +0100
++++ bluez-5.12/Makefile.am	2013-12-21 20:18:52.000000000 +0100
+@@ -245,6 +245,7 @@ unit_tests += unit/test-sdp
+ 
+ unit_test_sdp_SOURCES = unit/test-sdp.c \
+ 				src/shared/util.h src/shared/util.c \
++				src/log.h src/log.c \
+ 				src/sdpd.h src/sdpd-database.c \
+ 				src/sdpd-service.c src/sdpd-request.c
+ unit_test_sdp_LDADD = lib/libbluetooth-internal.la @GLIB_LIBS@
diff --git a/package/bluez/patches/patch-Makefile_in b/package/bluez/patches/patch-Makefile_in
new file mode 100644
index 000000000..d1abdecec
--- /dev/null
+++ b/package/bluez/patches/patch-Makefile_in
@@ -0,0 +1,11 @@
+--- bluez-5.12.orig/Makefile.in	2013-12-10 07:59:32.000000000 +0100
++++ bluez-5.12/Makefile.in	2013-12-21 20:02:59.000000000 +0100
+@@ -157,7 +157,7 @@ DIST_COMMON = README $(am__configure_dep
+ @ANDROID_TRUE@	android/bluetoothd android/haltest
+ @ANDROID_TRUE@am__append_30 = android/libhal-internal.la
+ @HID2HCI_TRUE@am__append_31 = $(rules_DATA)
+-TESTS = $(am__EXEEXT_8)
++TESTS = 
+ subdir = .
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
diff --git a/package/bluez/patches/patch-plugins_wiimote_c b/package/bluez/patches/patch-plugins_wiimote_c
new file mode 100644
index 000000000..30ba5e647
--- /dev/null
+++ b/package/bluez/patches/patch-plugins_wiimote_c
@@ -0,0 +1,10 @@
+--- bluez-5.12.orig/plugins/wiimote.c	2013-12-10 07:59:06.000000000 +0100
++++ bluez-5.12/plugins/wiimote.c	2013-12-21 19:29:22.000000000 +0100
+@@ -28,6 +28,7 @@
+ #include <stdbool.h>
+ 
+ #include <bluetooth/bluetooth.h>
++#include <fcntl.h>
+ #include <glib.h>
+ 
+ #include "plugin.h"
diff --git a/package/bluez/patches/patch-profiles_network_bnep_c b/package/bluez/patches/patch-profiles_network_bnep_c
new file mode 100644
index 000000000..5423f4e45
--- /dev/null
+++ b/package/bluez/patches/patch-profiles_network_bnep_c
@@ -0,0 +1,10 @@
+--- bluez-5.12.orig/profiles/network/bnep.c	2013-12-10 07:59:06.000000000 +0100
++++ bluez-5.12/profiles/network/bnep.c	2013-12-21 19:31:52.000000000 +0100
+@@ -32,6 +32,7 @@
+ #include <sys/param.h>
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
++#include <sys/types.h>
+ #include <sys/wait.h>
+ #include <net/if.h>
+ #include <linux/sockios.h>
diff --git a/package/bluez/patches/patch-tools_bccmd_c b/package/bluez/patches/patch-tools_bccmd_c
index 8278a834c..d9ac8ac35 100644
--- a/package/bluez/patches/patch-tools_bccmd_c
+++ b/package/bluez/patches/patch-tools_bccmd_c
@@ -1,6 +1,6 @@
---- bluez-4.92.orig/tools/bccmd.c	2010-11-30 15:50:48.000000000 +0100
-+++ bluez-4.92/tools/bccmd.c	2011-05-17 18:19:30.856601139 +0200
-@@ -1183,6 +1183,7 @@ int main(int argc, char *argv[])
+--- bluez-5.12.orig/tools/bccmd.c	2013-09-16 10:36:07.000000000 +0200
++++ bluez-5.12/tools/bccmd.c	2013-12-21 19:19:21.000000000 +0100
+@@ -1159,6 +1159,7 @@ int main(int argc, char *argv[])
  			case 115200: bcsp_rate = B115200; break;
  			case 230400: bcsp_rate = B230400; break;
  			case 460800: bcsp_rate = B460800; break;
@@ -8,7 +8,7 @@
  			case 500000: bcsp_rate = B500000; break;
  			case 576000: bcsp_rate = B576000; break;
  			case 921600: bcsp_rate = B921600; break;
-@@ -1202,6 +1203,7 @@ int main(int argc, char *argv[])
+@@ -1178,6 +1179,7 @@ int main(int argc, char *argv[])
  #ifdef B4000000
  			case 4000000: bcsp_rate = B4000000; break;
  #endif
diff --git a/package/bluez/patches/patch-tools_csr_usb_c b/package/bluez/patches/patch-tools_csr_usb_c
new file mode 100644
index 000000000..509061b56
--- /dev/null
+++ b/package/bluez/patches/patch-tools_csr_usb_c
@@ -0,0 +1,10 @@
+--- bluez-5.12.orig/tools/csr_usb.c	2013-09-16 10:36:07.000000000 +0200
++++ bluez-5.12/tools/csr_usb.c	2013-12-21 19:22:48.000000000 +0100
+@@ -29,6 +29,7 @@
+ #include <errno.h>
+ #include <ctype.h>
+ #include <fcntl.h>
++#include <limits.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/package/bluez/patches/patch-tools_hciattach_c b/package/bluez/patches/patch-tools_hciattach_c
index 45c8e2e7f..1021bb9f1 100644
--- a/package/bluez/patches/patch-tools_hciattach_c
+++ b/package/bluez/patches/patch-tools_hciattach_c
@@ -1,6 +1,6 @@
---- bluez-4.92.orig/tools/hciattach.c	2010-11-30 15:50:48.000000000 +0100
-+++ bluez-4.92/tools/hciattach.c	2011-05-17 18:18:20.776610031 +0200
-@@ -107,6 +107,7 @@ static int uart_speed(int s)
+--- bluez-5.12.orig/tools/hciattach.c	2012-12-24 18:46:55.000000000 +0100
++++ bluez-5.12/tools/hciattach.c	2013-12-21 19:19:21.000000000 +0100
+@@ -101,6 +101,7 @@ static int uart_speed(int s)
  		return B230400;
  	case 460800:
  		return B460800;
@@ -8,7 +8,7 @@
  	case 500000:
  		return B500000;
  	case 576000:
-@@ -137,6 +138,7 @@ static int uart_speed(int s)
+@@ -135,6 +136,7 @@ static int uart_speed(int s)
  	case 4000000:
  		return B4000000;
  #endif
diff --git a/package/bluez/patches/patch-tools_hciconfig_c b/package/bluez/patches/patch-tools_hciconfig_c
new file mode 100644
index 000000000..6e137449c
--- /dev/null
+++ b/package/bluez/patches/patch-tools_hciconfig_c
@@ -0,0 +1,10 @@
+--- bluez-5.12.orig/tools/hciconfig.c	2013-10-15 15:41:07.000000000 +0200
++++ bluez-5.12/tools/hciconfig.c	2013-12-21 19:26:45.000000000 +0100
+@@ -30,6 +30,7 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <ctype.h>
++#include <fcntl.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/package/bluez/patches/patch-unit_test-sdp_c b/package/bluez/patches/patch-unit_test-sdp_c
new file mode 100644
index 000000000..355300b79
--- /dev/null
+++ b/package/bluez/patches/patch-unit_test-sdp_c
@@ -0,0 +1,15 @@
+--- bluez-5.12.orig/unit/test-sdp.c	2013-10-15 15:41:07.000000000 +0200
++++ bluez-5.12/unit/test-sdp.c	2013-12-21 20:23:50.000000000 +0100
+@@ -128,12 +128,6 @@ static void sdp_debug(const char *str, v
+ 	g_print("%s%s\n", prefix, str);
+ }
+ 
+-void btd_debug(const char *format, ...);
+-
+-void btd_debug(const char *format, ...)
+-{
+-}
+-
+ static void context_quit(struct context *context)
+ {
+ 	g_main_loop_quit(context->main_loop);