Merge branch 'master' of git+ssh://openadk.org/git/openadk

Conflicts:
	BUGS
	package/autoconf/Makefile

4 files changed, 36 insertions, 19 deletions

diff --git a/package/dbus/Config.in b/package/dbus/Config.in
deleted file mode 100644
index 8e8ca33fc..000000000
--- a/package/dbus/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_PACKAGE_DBUS
-	prompt "dbus.............................. DBUS library"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBEXPAT
-	help
-	  DBUS library. 
-	  
-	  http://www.freedesktop.org/wiki/Software/dbus
-
diff --git a/package/dbus/Makefile b/package/dbus/Makefile
index a099da821..0e40fe548 100644
--- a/package/dbus/Makefile
+++ b/package/dbus/Makefile
@@ -10,14 +10,18 @@ PKG_MD5SUM:=		c7a47b851ebe02f6726b65b78d1b730b
 PKG_DESCR:=		DBUS library
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libexpat
+PKG_BUILDDEP+=		expat
 PKG_URL:=		http://dbus.freedesktop.org
 PKG_SITES:=		http://dbus.freedesktop.org/releases/dbus/
 
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS:=		libonly
+endif
+
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,DBUS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DBUS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-tests \
 			--disable-abstract-sockets \
 			--without-x \
@@ -28,16 +32,17 @@ CONFIGURE_ARGS+=	--disable-tests \
 			--disable-xml-docs \
 			--disable-doxygen-docs
 CONFIGURE_ENV+=		ac_cv_have_abstract_sockets=no
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
-post-install:
-	${INSTALL_DIR} ${IDIR_DBUS}/etc ${IDIR_DBUS}/usr/lib ${IDIR_DBUS}/usr/bin
+pre-install:
 	${INSTALL_DIR} $(STAGING_DIR)/usr/include/dbus-1.0/dbus
+	$(CP) $(WRKBUILD)/dbus/dbus-arch-deps.h \
+		$(STAGING_DIR)/usr/include/dbus-1.0/dbus/
+
+post-install:
+	${INSTALL_DIR} ${IDIR_DBUS}/etc ${IDIR_DBUS}/usr/lib \
+		${IDIR_DBUS}/usr/bin
 	${CP} ${WRKINST}/etc/dbus-1 ${IDIR_DBUS}/etc/
 	${CP} ${WRKINST}/usr/lib/libdbus-1.so.* ${IDIR_DBUS}/usr/lib/
-	$(CP) $(WRKINST)/usr/lib/dbus-1.0/include/dbus/dbus-arch-deps.h \
-		$(STAGING_DIR)/usr/include/dbus-1.0/dbus/
 	${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-daemon ${IDIR_DBUS}/usr/bin/
 	${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-launch ${IDIR_DBUS}/usr/bin/
 
diff --git a/package/dbus/files/dbus.init b/package/dbus/files/dbus.init
index 3484c4522..0f7367f38 100644
--- a/package/dbus/files/dbus.init
+++ b/package/dbus/files/dbus.init
@@ -14,7 +14,7 @@ start)
 	dbus-daemon --config-file=/etc/dbus-1/system.conf
 	;;
 stop)
-	killall dbus-daemon
+	pkill dbus-daemon
 	;;
 restart)
 	sh $0 stop
diff --git a/package/dbus/patches/patch-configure b/package/dbus/patches/patch-configure
new file mode 100644
index 000000000..f33a192a9
--- /dev/null
+++ b/package/dbus/patches/patch-configure
@@ -0,0 +1,22 @@
+--- dbus-1.2.16.orig/configure	2009-07-14 21:43:08.000000000 +0200
++++ dbus-1.2.16/configure	2010-01-15 19:03:24.000000000 +0100
+@@ -25213,19 +25213,6 @@ if test "x$GCC" = "xyes"; then
+      ;;
+   esac
+ 
+-  case " $CFLAGS " in
+-  *[\ \	]-fPIE[\ \	]*) ;;
+-  *) if cc_supports_flag -fPIE; then
+-        PIE_CFLAGS="-fPIE"
+-        if ld_supports_flag -z,relro; then
+-           PIE_LDFLAGS="-pie -Wl,-z,relro"
+-        else
+-           PIE_LDFLAGS="-pie"
+-        fi
+-     fi
+-     ;;
+-  esac
+-
+   ### Disabled warnings, and compiler flag overrides
+ 
+   # Let's just ignore unused for now