diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-01-26 19:10:41 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-01-26 19:10:41 +0000 |
| commit | e03683e06694c0a775e34f192039228f36ee7761 (patch) | |
| tree | cd96851142721689f51046734db5c9733363ba89 | |
| parent | 68bc1e172e6d7240325fa745db9028ff9826043b (diff) | |
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.
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | package/libglib2/libglib2.mk | 4 |
2 files changed, 4 insertions, 3 deletions
@@ -132,9 +132,6 @@ HOSTCPP:=$(shell which $(HOSTCPP) || type -p $(HOSTCPP) || echo cpp) HOSTLD:=$(shell which $(HOSTLD) || type -p $(HOSTLD) || echo ld) HOSTLN:=$(shell which $(HOSTLN) || type -p $(HOSTLN) || echo ln) 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 CFLAGS_FOR_BUILD:=-g -O2 diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index 2cf2459dc..14f851c06 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -14,6 +14,10 @@ LIBGLIB2_INSTALL_STAGING = YES LIBGLIB2_INSTALL_TARGET = YES 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 = \ ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \ glib_cv_uscore=no ac_cv_func_strtod=yes \ |