From e03683e06694c0a775e34f192039228f36ee7761 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 26 Jan 2009 19:10:41 +0000 Subject: [PATCH] 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. --- Makefile | 3 --- package/libglib2/libglib2.mk | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index c84a23eaed..e557717318 100644 --- a/Makefile +++ b/Makefile @@ -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 2cf2459dcf..14f851c069 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 \ -- 2.30.2