From 66eb138ccd61b70f8b4b2551a3ac4efc2c45c5d2 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Mon, 29 Jan 2007 12:59:17 +0000 Subject: - make fontconfig a little bit saner. It still tries to use the target stuff to create the binaries intended to run on the host, but this is a first step --- package/fontconfig/fontconfig.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package/fontconfig/fontconfig.mk') diff --git a/package/fontconfig/fontconfig.mk b/package/fontconfig/fontconfig.mk index 2f6314182..79ade2b85 100644 --- a/package/fontconfig/fontconfig.mk +++ b/package/fontconfig/fontconfig.mk @@ -24,7 +24,7 @@ $(FONTCONFIG_DIR)/.configured: $(FONTCONFIG_DIR)/.unpacked (cd $(FONTCONFIG_DIR); \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS) " \ - CCexe="$(HOSTCC)" \ + BUILD_CFLAGS="-O2 -I$(FREETYPE_HOST_DIR)/include/freetype2 -I$(FREETYPE_HOST_DIR)/include" \ ac_cv_func_mmap_fixed_mapped=yes \ ./configure \ --target=$(GNU_TARGET_NAME) \ @@ -49,7 +49,7 @@ $(FONTCONFIG_DIR)/.configured: $(FONTCONFIG_DIR)/.unpacked touch $(FONTCONFIG_DIR)/.configured $(FONTCONFIG_DIR)/.compiled: $(FONTCONFIG_DIR)/.configured - $(MAKE) CCexe="$(HOSTCC)" -C $(FONTCONFIG_DIR) + $(MAKE) -C $(FONTCONFIG_DIR) touch $(FONTCONFIG_DIR)/.compiled $(STAGING_DIR)/lib/libfontconfig.so: $(FONTCONFIG_DIR)/.compiled @@ -69,7 +69,7 @@ $(TARGET_DIR)/lib/libfontconfig.so: $(STAGING_DIR)/lib/libfontconfig.so cp -a $(STAGING_DIR)/usr/bin/fc-list $(TARGET_DIR)/usr/bin/ -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/fc-list -fontconfig: uclibc freetype $(TARGET_DIR)/lib/libfontconfig.so +fontconfig: uclibc freetype host-freetype $(TARGET_DIR)/lib/libfontconfig.so fontconfig-clean: $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(FONTCONFIG_DIR) uninstall -- cgit v1.2.3