NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dbus: revert r25156 (Fix dbus dependency on libxml2, without rebuild, works but may need refinement)

Browse Source 
As discussed on the list - Too complicated and wrong.
This commit is contained in:
Peter Korsgaard 2009-01-30 13:54:42 +00:00
parent 92bd25c9eb
commit e4051615c4
3 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/0/0-run-first.mk
View File

@ -1,4 +0,0 @@
ifeq ($(BR2_TARGET_LIBXML2),y)
TARGETS+=libxml2
endif

7
package/dbus/dbus.mk
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:=$(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 \

15
package/libxml2/libxml2.mk
View File

@ -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 $@