diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2011-07-10 11:58:10 +0200 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2011-07-10 11:58:10 +0200 |
| commit | b48fbe2f0b3be7e87653f693d4fd8dc5aafbad1e (patch) | |
| tree | 69ea4c1e84344cf7524b640642cce34344e0c960 /packages | |
| parent | 972d8a700c42d25f3f1cca88f32f81cba3e72c21 (diff) | |
| download | embtoolkit-b48fbe2f0b3be7e87653f693d4fd8dc5aafbad1e.tar.gz embtoolkit-b48fbe2f0b3be7e87653f693d4fd8dc5aafbad1e.tar.bz2 embtoolkit-b48fbe2f0b3be7e87653f693d4fd8dc5aafbad1e.tar.xz | |
Packages: fontconfig: once again a try to it detect correctly freetype
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/graphics/fontconfig/fontconfig.mk | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/packages/graphics/fontconfig/fontconfig.mk b/packages/graphics/fontconfig/fontconfig.mk index 9686735..73a4047 100644 --- a/packages/graphics/fontconfig/fontconfig.mk +++ b/packages/graphics/fontconfig/fontconfig.mk @@ -38,16 +38,31 @@ FONTCONFIG_INCLUDES = fontconfig FONTCONFIG_LIBS = libfontconfig* FONTCONFIG_PKGCONFIGS = fontconfig.pc -LIBXML2_CFLAGS := -I$(SYSROOT)/usr/include/libxml2 -LIBXML2_CFLAGS += -L$(SYSROOT)/usr/$(LIBDIR) +LIBXML2_CFLAGS-y = -I$(SYSROOT)/usr/include/libxml2 +LIBXML2_LIBS-y = -L$(SYSROOT)/usr/$(LIBDIR) -FREETYPE_CFLAGS := -I$(SYSROOT)/usr/include/freetype2 -FREETYPE_CFLAGS += -L$(SYSROOT)/usr/$(LIBDIR) +FREETYPE_CFLAGS-y = $(shell \ + PKG_CONFIG_PATH=$(EMBTK_PKG_CONFIG_PATH) \ + PKG_CONFIG_LIBDIR="$(EMBTK_PKG_CONFIG_LIBDIR)" \ + $(PKGCONFIG_BIN) freetype2 --cflags) +FREETYPE_LIBS-y = $(shell \ + PKG_CONFIG_PATH=$(EMBTK_PKG_CONFIG_PATH) \ + PKG_CONFIG_LIBDIR="$(EMBTK_PKG_CONFIG_LIBDIR)" \ + $(PKGCONFIG_BIN) freetype2 --libs) + +FONTCONFIG_CONFIGURE_ENV = LIBXML2_CFLAGS="$(LIBXML2_CFLAGS-y)" +FONTCONFIG_CONFIGURE_ENV += LIBXML2_CFLAGS="$(LIBXML2_LIBS-y)" +FONTCONFIG_CONFIGURE_ENV += FREETYPE_CFLAGS="$(FREETYPE_CFLAGS-y)" +FONTCONFIG_CONFIGURE_ENV += FREETYPE_LIBS="$(FREETYPE_LIBS-y)" -FONTCONFIG_CONFIGURE_ENV := LIBXML2_CFLAGS="$(LIBXML2_CFLAGS)" -FONTCONFIG_CONFIGURE_ENV := FREETYPE_CFLAGS="$(FREETYPE_CFLAGS)" FONTCONFIG_CONFIGURE_OPTS := --with-arch=$(STRICT_GNU_TARGET) \ - --disable-docs --program-prefix="" + --disable-docs --program-prefix="" \ + --with-freetype-config=true + +FONTCONFIG_MAKE_OPTS = LIBXML2_CFLAGS="$(LIBXML2_CFLAGS-y)" +FONTCONFIG_MAKE_OPTS += LIBXML2_CFLAGS="$(LIBXML2_LIBS-y)" +FONTCONFIG_MAKE_OPTS += FREETYPE_CFLAGS="$(FREETYPE_CFLAGS-y)" +FONTCONFIG_MAKE_OPTS += FREETYPE_LIBS="$(FREETYPE_LIBS-y)" FONTCONFIG_DEPS := libxml2_install freetype_install |