jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-27 13:16:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

package: fix host path

Browse Source 
And generate dbus introspect xml for dbus-glib.
This commit is contained in:
Peter Korsgaard 2009-03-17 13:48:15 +00:00
parent 1549e9f366
commit 4311f0fe39
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/Makefile.in
View File

@ -188,7 +188,7 @@ BISON:=$(shell which bison || type -p bison)
HOST_CFLAGS += -I$(HOST_DIR)/include -I$(HOST_DIR)/usr/include HOST_CFLAGS += -I$(HOST_DIR)/include -I$(HOST_DIR)/usr/include
HOST_CXXFLAGS += -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_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 as an integer - E.G. 4.3.2 => 432
HOSTCC_VERSION:=$(shell $(HOSTCC) --version | \ HOSTCC_VERSION:=$(shell $(HOSTCC) --version | \
@ -261,7 +261,7 @@ TARGET_CONFIGURE_ENV=\
LDFLAGS="$(TARGET_LDFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS)" \
FCFLAGS="$(TARGET_FCFLAGS)" \ FCFLAGS="$(TARGET_FCFLAGS)" \
HOST_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \ HOST_CONFIGURE_OPTS=PATH=$(HOST_PATH) \
AR="$(HOSTAR)" \ AR="$(HOSTAR)" \
AS="$(HOSTAS)" \ AS="$(HOSTAS)" \
LD="$(HOSTLD) $(HOST_LDFLAGS)" \ LD="$(HOSTLD) $(HOST_LDFLAGS)" \
@ -299,6 +299,8 @@ HOST_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
PKG_CONFIG="$(STAGING_DIR)/usr/bin/pkg-config" \ PKG_CONFIG="$(STAGING_DIR)/usr/bin/pkg-config" \
PKG_CONFIG_PATH="$(HOST_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" PKG_CONFIG_PATH="$(HOST_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)"
HOST_MAKE_ENV=PATH=$(HOST_PATH)
####################################################################### #######################################################################
# settings we need to pass to configure # settings we need to pass to configure

9
package/dbus/dbus.mk
View File

@ -57,6 +57,7 @@ $(DBUS_HOOK_POST_INSTALL): $(DBUS_TARGET_INSTALL_TARGET)
# dbus for the host # dbus for the host
DBUS_HOST_DIR:=$(BUILD_DIR)/dbus-$(DBUS_VERSION)-host DBUS_HOST_DIR:=$(BUILD_DIR)/dbus-$(DBUS_VERSION)-host
DBUS_HOST_BINARY:=$(HOST_DIR)/usr/bin/dbus-daemon 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) $(DBUS_HOST_DIR)/.unpacked: $(DL_DIR)/$(DBUS_SOURCE)
mkdir -p $(@D) mkdir -p $(@D)
@ -87,18 +88,22 @@ $(DBUS_HOST_DIR)/.configured: $(DBUS_HOST_DIR)/.unpacked $(EXPAT_HOST_BINARY)
touch $@ touch $@
$(DBUS_HOST_DIR)/.compiled: $(DBUS_HOST_DIR)/.configured $(DBUS_HOST_DIR)/.compiled: $(DBUS_HOST_DIR)/.configured
$(MAKE) -C $(@D) $(HOST_MAKE_ENV) $(MAKE) -C $(@D)
touch $@ touch $@
$(DBUS_HOST_BINARY): $(DBUS_HOST_DIR)/.compiled $(DBUS_HOST_BINARY): $(DBUS_HOST_DIR)/.compiled
$(MAKE) -C $(<D) install $(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-source: dbus-source
host-dbus-clean: host-dbus-clean:
rm -f $(addprefix $(DBUS_HOST_DIR)/,.unpacked .configured .compiled) 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) uninstall
$(MAKE) -C $(DBUS_HOST_DIR) clean $(MAKE) -C $(DBUS_HOST_DIR) clean

2
package/expat/expat.mk
View File

@ -46,7 +46,7 @@ $(EXPAT_HOST_DIR)/.configured: $(EXPAT_HOST_DIR)/.unpacked
touch $@ touch $@
$(EXPAT_HOST_DIR)/.compiled: $(EXPAT_HOST_DIR)/.configured $(EXPAT_HOST_DIR)/.compiled: $(EXPAT_HOST_DIR)/.configured
$(MAKE) -C $(@D) $(HOST_MAKE_ENV) $(MAKE) -C $(@D)
touch $@ touch $@
$(EXPAT_HOST_BINARY): $(EXPAT_HOST_DIR)/.compiled $(EXPAT_HOST_BINARY): $(EXPAT_HOST_DIR)/.compiled

2
package/libglib2/libglib2.mk
View File

@ -99,7 +99,7 @@ $(LIBGLIB2_HOST_DIR)/.compiled: $(LIBGLIB2_HOST_DIR)/.configured
touch $@ touch $@
$(LIBGLIB2_HOST_BINARY): $(LIBGLIB2_HOST_DIR)/.compiled $(LIBGLIB2_HOST_BINARY): $(LIBGLIB2_HOST_DIR)/.compiled
$(MAKE) -C $(<D) install $(HOST_MAKE_ENV) $(MAKE) -C $(<D) install
host-libglib2: $(LIBGLIB2_HOST_BINARY) host-libglib2: $(LIBGLIB2_HOST_BINARY)