mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-29 06:06:32 +00:00
libglib2: move HOST_GLIB detection to glib package
Makes more sense to have it here, and easier to change once we start building host-glib.
This commit is contained in:
parent
68bc1e172e
commit
e03683e066
3
Makefile
3
Makefile
@ -132,9 +132,6 @@ HOSTCPP:=$(shell which $(HOSTCPP) || type -p $(HOSTCPP) || echo cpp)
|
|||||||
HOSTLD:=$(shell which $(HOSTLD) || type -p $(HOSTLD) || echo ld)
|
HOSTLD:=$(shell which $(HOSTLD) || type -p $(HOSTLD) || echo ld)
|
||||||
HOSTLN:=$(shell which $(HOSTLN) || type -p $(HOSTLN) || echo ln)
|
HOSTLN:=$(shell which $(HOSTLN) || type -p $(HOSTLN) || echo ln)
|
||||||
HOSTNM:=$(shell which $(HOSTNM) || type -p $(HOSTNM) || echo nm)
|
HOSTNM:=$(shell which $(HOSTNM) || type -p $(HOSTNM) || echo nm)
|
||||||
HOST_GLIB_BIN:=`dirname $(shell which glib-genmarshal || echo /usr/bin/glib-genmarshal)`
|
|
||||||
HOST_GLIB:=$(shell dirname $(HOST_GLIB_BIN) || echo /usr)
|
|
||||||
|
|
||||||
|
|
||||||
ifndef CFLAGS_FOR_BUILD
|
ifndef CFLAGS_FOR_BUILD
|
||||||
CFLAGS_FOR_BUILD:=-g -O2
|
CFLAGS_FOR_BUILD:=-g -O2
|
||||||
|
@ -14,6 +14,10 @@ LIBGLIB2_INSTALL_STAGING = YES
|
|||||||
LIBGLIB2_INSTALL_TARGET = YES
|
LIBGLIB2_INSTALL_TARGET = YES
|
||||||
LIBGLIB2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
|
LIBGLIB2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
|
||||||
|
|
||||||
|
# detect install prefix of host glib development stuff
|
||||||
|
HOST_GLIB_BIN:=`dirname $(shell which glib-genmarshal || echo /usr/bin/glib-genmarshal)`
|
||||||
|
HOST_GLIB:=$(shell dirname $(HOST_GLIB_BIN) || echo /usr)
|
||||||
|
|
||||||
LIBGLIB2_CONF_ENV = \
|
LIBGLIB2_CONF_ENV = \
|
||||||
ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
|
ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
|
||||||
glib_cv_uscore=no ac_cv_func_strtod=yes \
|
glib_cv_uscore=no ac_cv_func_strtod=yes \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user