diff options
Diffstat (limited to 'package/dbus/dbus.mk')
| -rw-r--r-- | package/dbus/dbus.mk | 46 |
1 files changed, 24 insertions, 22 deletions
diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index e93738e35..182028641 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -3,19 +3,12 @@ # dbus # ############################################################# -DBUS_VERSION = 1.2.16 +DBUS_VERSION = 1.2.24 DBUS_SOURCE = dbus-$(DBUS_VERSION).tar.gz DBUS_SITE = http://dbus.freedesktop.org/releases/dbus/ DBUS_LIBTOOL_PATCH = NO DBUS_INSTALL_STAGING = YES DBUS_INSTALL_TARGET = YES -ifeq ($(BR2_ENABLE_DEBUG),y) -# install-exec doesn't install the config file -DBUS_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install -else -# install-strip uses host strip -DBUS_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-strip STRIPPROG="$(STRIPCMD)" -endif DBUS_DEPENDENCIES = host-pkg-config @@ -49,6 +42,29 @@ else DBUS_CONF_OPT += --without-x endif +# fix rebuild (dbus makefile errors out if /var/lib/dbus is a symlink) +define DBUS_REMOVE_VAR_LIB_DBUS + rm -rf $(TARGET_DIR)/var/lib/dbus +endef + +DBUS_POST_BUILD_HOOKS += DBUS_REMOVE_VAR_LIB_DBUS + +define DBUS_REMOVE_DEVFILES + rm -rf $(TARGET_DIR)/usr/lib/dbus-1.0 +endef + +ifneq ($(BR2_HAVE_DEVFILES),y) +DBUS_POST_INSTALL_TARGET_HOOKS += DBUS_REMOVE_DEVFILES +endif + +define DBUS_INSTALL_TARGET_FIXUP + rm -rf $(TARGET_DIR)/var/lib/dbus + ln -sf /tmp/dbus $(TARGET_DIR)/var/lib/dbus + $(INSTALL) -m 0755 package/dbus/S30dbus $(TARGET_DIR)/etc/init.d +endef + +DBUS_POST_INSTALL_TARGET_HOOKS += DBUS_INSTALL_TARGET_FIXUP + HOST_DBUS_DEPENDENCIES = host-pkg-config host-expat HOST_DBUS_CONF_OPT = \ --with-dbus-user=dbus \ @@ -73,17 +89,3 @@ HOST_DBUS_POST_INSTALL_HOOKS += HOST_DBUS_GEN_INTROSPECT $(eval $(call AUTOTARGETS,package,dbus)) $(eval $(call AUTOTARGETS,package,dbus,host)) - -# fix rebuild (dbus makefile errors out if /var/lib/dbus is a symlink) -$(DBUS_HOOK_POST_BUILD): $(DBUS_TARGET_BUILD) - rm -rf $(TARGET_DIR)/var/lib/dbus - touch $@ - -$(DBUS_HOOK_POST_INSTALL): $(DBUS_TARGET_INSTALL_TARGET) -ifneq ($(BR2_HAVE_DEVFILES),y) - rm -rf $(TARGET_DIR)/usr/lib/dbus-1.0 -endif - rm -rf $(TARGET_DIR)/var/lib/dbus - ln -sf /tmp/dbus $(TARGET_DIR)/var/lib/dbus - $(INSTALL) -m 0755 package/dbus/S30dbus $(TARGET_DIR)/etc/init.d - touch $@ |