Fix dbus dependency on libxml2, without rebuild, works but may need refinement

This commit is contained in:
Ulf Samuelsson
2009-01-30 07:40:14 +00:00
parent 0effa31366
commit 4b25f84ab9
3 changed files with 21 additions and 5 deletions

View File

@@ -15,16 +15,16 @@ 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:=$(STAGING_DIR)/usr/lib/libexpat.so.1
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)
DBUS_XML_DEP:=$(LIBXML2_HOOK_POST_INSTALL)
#libxml2-install-staging
endif
DBUS_XML_DEP:=$(DBUS_XML_DEP_LIB)
$(DL_DIR)/$(DBUS_SOURCE):
$(call DOWNLOAD,$(DBUS_SITE),$(DBUS_SOURCE))
@@ -37,6 +37,7 @@ $(DBUS_DIR)/.unpacked: $(DL_DIR)/$(DBUS_SOURCE)
$(DBUS_DIR)/.configured: $(DBUS_DIR)/.unpacked $(DBUS_XML_DEP)
(cd $(DBUS_DIR); rm -rf config.cache; \
echo "dbus is depending on $(DBUS_XML_DEP)"; \
$(TARGET_CONFIGURE_OPTS) \
$(TARGET_CONFIGURE_ARGS) \
ac_cv_have_abstract_sockets=yes \