From f49f4b2ac00d9d0388dc873cb5f5154fb82ffb62 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 20 Jun 2008 21:45:21 +0000 Subject: [PATCH] dbus: depend on libxml2-install-staging instead for libxml2 Makefile.autools.in doesn't have proper dependencies set up for the .stamp files, so use the libxml2-install-staging target instead. This does unfortunately mean that dbus is always considered out of date, but atleast it works. --- package/dbus/dbus.mk | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index d68f434141..cfa4e7feba 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -18,12 +18,9 @@ DBUS_XML:=expat DBUS_XML_DEP:=$(STAGING_DIR)/usr/lib/libexpat.so.1 else DBUS_XML:=libxml -# depend on the exact target instead of libxml2 so dbus isn't always -# considered out-of-date. -# It would be neat to use $(LIBXML2_TARGET_INSTALL_STAGING) here, -# but the libxml2 makefile is only parsed after dbus, so that doesn't work -DBUS_XML_DEP:=$(BUILD_DIR)/libxml2-2.6.29/.stamp_staging_installed -$(LIBXML2_TARGET_INSTALL_STAGING) +# Makefile.autotools.in unfortunately has broken dependency handling, +# so we cannot do the same for libxml2 +DBUS_XML_DEP:=libxml2-install-staging endif $(DL_DIR)/$(DBUS_SOURCE): -- 2.30.2