gitolite/buildrootschalter
gitolite/buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dbus: fix xml dependency and stop continous rebuilds

Browse Source
This commit is contained in:
Peter Korsgaard 2009-01-30 13:54:47 +00:00
parent e4051615c4
commit 9ce75bf893
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
package/dbus/dbus.mk
View File

@ -13,19 +13,12 @@ DBUS_TARGET_BINARY:=usr/bin/dbus-daemon
ifeq ($(BR2_DBUS_EXPAT),y)
DBUS_XML:=expat
# depend on the exact library file instead of expat so dbus isn't always
# considered out-of-date
DBUS_XML_DEP_LIB:=$(STAGING_DIR)/usr/lib/libexpat.so.1
DBUS_XML_DEP:=expat
else
DBUS_XML:=libxml
# Makefile.autotools.in unfortunately has broken dependency handling,
# so we cannot do the same for libxml2
DBUS_XML_DEP_LIB:=$(LIBXML2_HOOK_POST_INSTALL)
#libxml2-install-staging
DBUS_XML_DEP:=libxml2
endif
DBUS_XML_DEP:=$(DBUS_XML_DEP_LIB)
$(DL_DIR)/$(DBUS_SOURCE):
$(call DOWNLOAD,$(DBUS_SITE),$(DBUS_SOURCE))
@ -35,7 +28,7 @@ $(DBUS_DIR)/.unpacked: $(DL_DIR)/$(DBUS_SOURCE)
$(DBUS_CAT) $(DL_DIR)/$(DBUS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
touch $@
$(DBUS_DIR)/.configured: $(DBUS_DIR)/.unpacked $(DBUS_XML_DEP)
$(DBUS_DIR)/.configured: $(DBUS_DIR)/.unpacked
(cd $(DBUS_DIR); rm -rf config.cache; \
$(TARGET_CONFIGURE_OPTS) \
$(TARGET_CONFIGURE_ARGS) \
@ -93,7 +86,7 @@ ifneq ($(BR2_HAVE_MANPAGES),y)
rm -rf $(TARGET_DIR)/usr/share/man
endif
dbus: uclibc pkgconfig $(TARGET_DIR)/$(DBUS_TARGET_BINARY)
dbus: uclibc pkgconfig $(DBUS_XML_DEP) $(TARGET_DIR)/$(DBUS_TARGET_BINARY)
dbus-clean:
rm -f $(TARGET_DIR)/etc/dbus-1/session.conf