From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 17 Mar 2009 13:48:15 +0000 (-0000)
Subject: package: fix host path
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4311f0fe39bdbd4648f74ff59efefa466549a9b5;p=buildroot.git

package: fix host path

And generate dbus introspect xml for dbus-glib.
---

diff --git a/package/Makefile.in b/package/Makefile.in
index b94b5bc25d..92f68b6f8d 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -188,7 +188,7 @@ BISON:=$(shell which bison || type -p bison)
 HOST_CFLAGS   += -I$(HOST_DIR)/include -I$(HOST_DIR)/usr/include
 HOST_CXXFLAGS += -I$(HOST_DIR)/include -I$(HOST_DIR)/usr/include
 HOST_LDFLAGS  += -L$(HOST_DIR)/lib -L$(HOST_DIR)/usr/lib
-
+HOST_PATH=$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(PATH)
 
 # hostcc version as an integer - E.G. 4.3.2 => 432
 HOSTCC_VERSION:=$(shell $(HOSTCC) --version | \
@@ -261,7 +261,7 @@ TARGET_CONFIGURE_ENV=\
 	LDFLAGS="$(TARGET_LDFLAGS)" \
 	FCFLAGS="$(TARGET_FCFLAGS)" \
 
-HOST_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
+HOST_CONFIGURE_OPTS=PATH=$(HOST_PATH) \
 		AR="$(HOSTAR)" \
 		AS="$(HOSTAS)" \
 		LD="$(HOSTLD) $(HOST_LDFLAGS)" \
@@ -299,6 +299,8 @@ HOST_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
 		PKG_CONFIG="$(STAGING_DIR)/usr/bin/pkg-config" \
 		PKG_CONFIG_PATH="$(HOST_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)"
 
+HOST_MAKE_ENV=PATH=$(HOST_PATH)
+
 #######################################################################
 # settings we need to pass to configure
 
diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index 9d43ab2a48..4c047012c4 100644
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -57,6 +57,7 @@ $(DBUS_HOOK_POST_INSTALL): $(DBUS_TARGET_INSTALL_TARGET)
 # dbus for the host
 DBUS_HOST_DIR:=$(BUILD_DIR)/dbus-$(DBUS_VERSION)-host
 DBUS_HOST_BINARY:=$(HOST_DIR)/usr/bin/dbus-daemon
+DBUS_HOST_INTROSPECT:=$(DBUS_HOST_DIR)/introspect.xml
 
 $(DBUS_HOST_DIR)/.unpacked: $(DL_DIR)/$(DBUS_SOURCE)
 	mkdir -p $(@D)
@@ -87,18 +88,22 @@ $(DBUS_HOST_DIR)/.configured: $(DBUS_HOST_DIR)/.unpacked $(EXPAT_HOST_BINARY)
 	touch $@
 
 $(DBUS_HOST_DIR)/.compiled: $(DBUS_HOST_DIR)/.configured
-	$(MAKE) -C $(@D)
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D)
 	touch $@
 
 $(DBUS_HOST_BINARY): $(DBUS_HOST_DIR)/.compiled
 	$(MAKE) -C $(<D) install
 
-host-dbus: $(DBUS_HOST_BINARY)
+$(DBUS_HOST_INTROSPECT): $(DBUS_HOST_BINARY)
+	$(DBUS_HOST_BINARY) --introspect > $@
+
+host-dbus: $(DBUS_HOST_INTROSPECT)
 
 host-dbus-source: dbus-source
 
 host-dbus-clean:
 	rm -f $(addprefix $(DBUS_HOST_DIR)/,.unpacked .configured .compiled)
+	rm -f $(DBUS_HOST_INTROSPECT)
 	$(MAKE) -C $(DBUS_HOST_DIR) uninstall
 	$(MAKE) -C $(DBUS_HOST_DIR) clean
 
diff --git a/package/expat/expat.mk b/package/expat/expat.mk
index 17d95c72c8..b8624b7727 100644
--- a/package/expat/expat.mk
+++ b/package/expat/expat.mk
@@ -46,7 +46,7 @@ $(EXPAT_HOST_DIR)/.configured: $(EXPAT_HOST_DIR)/.unpacked
 	touch $@
 
 $(EXPAT_HOST_DIR)/.compiled: $(EXPAT_HOST_DIR)/.configured
-	$(MAKE) -C $(@D)
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D)
 	touch $@
 
 $(EXPAT_HOST_BINARY): $(EXPAT_HOST_DIR)/.compiled
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index a8654349df..8adc060d02 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -99,7 +99,7 @@ $(LIBGLIB2_HOST_DIR)/.compiled: $(LIBGLIB2_HOST_DIR)/.configured
 	touch $@
 
 $(LIBGLIB2_HOST_BINARY): $(LIBGLIB2_HOST_DIR)/.compiled
-	$(MAKE) -C $(<D) install
+	$(HOST_MAKE_ENV) $(MAKE) -C $(<D) install
 
 host-libglib2: $(LIBGLIB2_HOST_BINARY)