diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-01-30 13:54:42 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-01-30 13:54:42 +0000 |
| commit | e4051615c4ba14b75bd52dd03db7914f8a0a5c76 (patch) | |
| tree | ae9e4efc0f16838e972d4b1d03765cab46453066 /package | |
| parent | 92bd25c9eb14eafb1beb8f41af71fef1e545922a (diff) | |
| download | buildroot-novena-e4051615c4ba14b75bd52dd03db7914f8a0a5c76.tar.gz buildroot-novena-e4051615c4ba14b75bd52dd03db7914f8a0a5c76.zip | |
dbus: revert r25156 (Fix dbus dependency on libxml2, without rebuild, works but may need refinement)
As discussed on the list - Too complicated and wrong.
Diffstat (limited to 'package')
| -rw-r--r-- | package/0/0-run-first.mk | 4 | ||||
| -rw-r--r-- | package/dbus/dbus.mk | 7 | ||||
| -rw-r--r-- | package/libxml2/libxml2.mk | 15 |
3 files changed, 5 insertions, 21 deletions
diff --git a/package/0/0-run-first.mk b/package/0/0-run-first.mk deleted file mode 100644 index c26b5dac4..000000000 --- a/package/0/0-run-first.mk +++ /dev/null @@ -1,4 +0,0 @@ -ifeq ($(BR2_TARGET_LIBXML2),y) -TARGETS+=libxml2 -endif - diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index b54f8da00..c98827ba3 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -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:=$(STAGING_DIR)/usr/lib/libexpat.so.1 +DBUS_XML_DEP_LIB:=$(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:=$(LIBXML2_HOOK_POST_INSTALL) +DBUS_XML_DEP_LIB:=$(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,7 +37,6 @@ $(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 \ diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index 0152c9615..e183de50d 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -8,7 +8,7 @@ LIBXML2_SOURCE = libxml2-sources-$(LIBXML2_VERSION).tar.gz LIBXML2_SITE = ftp://xmlsoft.org/libxml2 LIBXML2_INSTALL_STAGING = YES LIBXML2_INSTALL_TARGET = YES -LIBXML2_LIBTOOL_PATCH = NO + ifneq ($(BR2_LARGEFILE),y) LIBXML2_CONF_ENV = CC="$(TARGET_CC) $(TARGET_CFLAGS) -DNO_LARGEFILE_SOURCE" endif @@ -27,21 +27,10 @@ $(LIBXML2_HOOK_POST_EXTRACT): rm -f $(LIBXML2_DIR)/macos/src/XMLTestPrefix.h.rej touch $@ -$(LIBXML2_HOOK_POST_INSTALL):\ - $(LIBXML2_TARGET_SOURCE) \ - $(LIBXML2_TARGET_EXTRACT) \ - $(LIBXML2_HOOK_POST_EXTRACT) \ - $(LIBXML2_TARGET_PATCH) \ - $(LIBXML2_TARGET_AUTORECONF) \ - $(LIBXML2_TARGET_CONFIGURE) \ - $(LIBXML2_TARGET_LIBTOOL_PATCH) \ - $(LIBXML2_TARGET_BUILD) \ - $(LIBXML2_HOOK_POST_BUILD) \ - $(LIBXML2_TARGET_INSTALL_STAGING) +$(LIBXML2_HOOK_POST_INSTALL): $(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xml2-config $(SED) "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xml2-config rm -rf $(TARGET_DIR)/usr/share/aclocal \ $(TARGET_DIR)/usr/share/doc/libxml2-$(LIBXML2_VERSION) \ $(TARGET_DIR)/usr/share/gtk-doc touch $@ - |