Commit ebe6ce42 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

hal: fix build, correct glib/udev/expat paths 



Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent c09e5103

package/hal/hal.mk

+8 −7
Original line number Diff line number Diff line
@@ -12,11 +12,11 @@ HAL_BINARY:=hald/hald 
HAL_TARGET_BINARY:=usr/sbin/hald



GLIB_CFLAGS:=-I$(STAGING_DIR)/usr/include/glib-2.0 \

	     -I$(STAGING_DIR)/lib/glib/include

GLIB_LIBS:=$(STAGING_DIR)/lib/libglib-2.0.so \

	   $(STAGING_DIR)/lib/libgmodule-2.0.so \

	   $(STAGING_DIR)/lib/libgobject-2.0.so \

	   $(STAGING_DIR)/lib/libgthread-2.0.so

	     -I$(STAGING_DIR)/usr/lib/glib-2.0/include

GLIB_LIBS:=$(STAGING_DIR)/usr/lib/libglib-2.0.so \

	   $(STAGING_DIR)/usr/lib/libgmodule-2.0.so \

	   $(STAGING_DIR)/usr/lib/libgobject-2.0.so \

	   $(STAGING_DIR)/usr/lib/libgthread-2.0.so

DBUS_GLIB_LIBS:=$(STAGING_DIR)/usr/lib/libdbus-glib-1.so



$(DL_DIR)/$(HAL_SOURCE):
@@ -29,7 +29,7 @@ $(HAL_DIR)/.unpacked: $(DL_DIR)/$(HAL_SOURCE) 
	toolchain/patch-kernel.sh $(HAL_DIR) package/hal/ \*.patch

	touch $(HAL_DIR)/.unpacked



$(HAL_DIR)/.configured: $(HAL_DIR)/.unpacked /usr/bin/pkg-config

$(HAL_DIR)/.configured: $(HAL_DIR)/.unpacked

	(cd $(HAL_DIR); rm -rf config.cache; \

		$(TARGET_CONFIGURE_OPTS) \

		$(TARGET_CONFIGURE_ARGS) \
@@ -39,7 +39,7 @@ $(HAL_DIR)/.configured: $(HAL_DIR)/.unpacked /usr/bin/pkg-config 
		DBUS_CFLAGS="-I$(STAGING_DIR)/usr/include/dbus-1.0 -I$(STAGING_DIR)/usr/lib/dbus-1.0/include" \

		DBUS_LIBS="$(STAGING_DIR)/usr/lib/libdbus-1.so" \

		VOLUME_ID_CFLAGS="$(TARGET_CFLAGS)" \

		VOLUME_ID_LIBS="$(STAGING_DIR)/usr/lib/libvolume_id.so" \

		VOLUME_ID_LIBS="$(STAGING_DIR)/lib/libvolume_id.so" \

		ac_cv_path_LIBUSB_CONFIG= \

		./configure $(QUIET) \

		--target=$(GNU_TARGET_NAME) \
@@ -49,6 +49,7 @@ $(HAL_DIR)/.configured: $(HAL_DIR)/.unpacked /usr/bin/pkg-config 
		--sysconfdir=/etc \

		--localstatedir=/var \

		--with-hwdata=$(TARGET_DIR)/usr/share/hwdata \

		--with-expat=$(STAGING_DIR)/usr/ \

		--disable-policy-kit \

		--disable-gtk-doc \

		--disable-static \

package/hal/hal01-configure-buildroot-cross.patch

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
diff -ur hal-0.5.8/configure hal-0.5.8-patched/configure

--- hal-0.5.8/configure	2006-11-15 12:34:03.000000000 -0600

+++ hal-0.5.8-patched/configure	2006-11-15 12:33:36.000000000 -0600

@@ -22014,7 +22014,7 @@

 echo "$as_me:$LINENO: result: $ac_cv_lib_expat_XML_ParserCreate" >&5

 echo "${ECHO_T}$ac_cv_lib_expat_XML_ParserCreate" >&6

 if test $ac_cv_lib_expat_XML_ParserCreate = yes; then

-  EXPAT_LIB="-lexpat"

+  EXPAT_LIB="\$(STAGING_DIR)/lib/libexpat.so"

 fi