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

Replace configuring GLIB with autodetect

Browse Source
This commit is contained in:
Ulf Samuelsson 2008-07-06 07:34:41 +00:00
parent 65f89c8a9c
commit 54e9332892
2 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Config.in
View File

@ -78,17 +78,6 @@ config BR2_DL_DIR
The default is $(BASE_DIR)/dl The default is $(BASE_DIR)/dl
config BR2_HOST_GLIB
string "Location of host Gnome library"
default "/usr"
help
Directory where Gnome is installed on the host
Gnome applications is installed in $(BR2_HOST_LIB)/bin
This is needed to build libgtk etc.
The default is /usr
It can be overridden by the BUILDROOT_HOST_GLIB
shell variable
source "target/device/Config.in.mirrors" source "target/device/Config.in.mirrors"
config BR2_STAGING_DIR config BR2_STAGING_DIR

11
Makefile
View File

@ -57,12 +57,6 @@ BR2_DL_DIR:=$(BUILDROOT_DL_DIR)
endif endif
LOCAL:=$(BR2_LOCAL) LOCAL:=$(BR2_LOCAL)
ifneq ($(BUILDROOT_HOST_GLIB),)
HOST_GLIB:=$(BUILDROOT_HOST_GLIB)
else
HOST_GLIB:=$(BR2_HOST_GLIB)
endif
# To put more focus on warnings, be less verbose as default # To put more focus on warnings, be less verbose as default
# Use 'make V=1' to see the full commands # Use 'make V=1' to see the full commands
ifdef V ifdef V
@ -128,6 +122,10 @@ HOSTCPP:=$(shell $(CONFIG_SHELL) -c "which $(HOSTCPP)" || type -p $(HOSTCPP) ||
HOSTLD:=$(shell $(CONFIG_SHELL) -c "which $(HOSTLD)" || type -p $(HOSTLD) || echo ld) HOSTLD:=$(shell $(CONFIG_SHELL) -c "which $(HOSTLD)" || type -p $(HOSTLD) || echo ld)
HOSTLN:=$(shell $(CONFIG_SHELL) -c "which $(HOSTLN)" || type -p $(HOSTLN) || echo ln) HOSTLN:=$(shell $(CONFIG_SHELL) -c "which $(HOSTLN)" || type -p $(HOSTLN) || echo ln)
HOSTNM:=$(shell $(CONFIG_SHELL) -c "which $(HOSTNM)" || type -p $(HOSTNM) || echo nm) HOSTNM:=$(shell $(CONFIG_SHELL) -c "which $(HOSTNM)" || type -p $(HOSTNM) || echo nm)
HOST_GLIB_BIN:=`dirname $(shell $(CONFIG_SHELL) -c "which glib-genmarshal" || echo /usr/bin/glib-genmarshal)`
HOST_GLIB:=$(shell $(CONFIG_SHELL) -c "dirname $(HOST_GLIB_BIN)" || echo /usr)
ifndef CFLAGS_FOR_BUILD ifndef CFLAGS_FOR_BUILD
CFLAGS_FOR_BUILD:=-g -O2 CFLAGS_FOR_BUILD:=-g -O2
endif endif
@ -522,3 +520,4 @@ status:
@echo LOCAL=$(LOCAL) @echo LOCAL=$(LOCAL)
@echo BR2_DL_DIR=$(BR2_DL_DIR) @echo BR2_DL_DIR=$(BR2_DL_DIR)
@echo HOST_GLIB=$(HOST_GLIB) @echo HOST_GLIB=$(HOST_GLIB)
@echo HOST_GLIB_BIN=$(HOST_GLIB_BIN)