From d83b92a03213250e00fd18f1b292affdc35ff505 Mon Sep 17 00:00:00 2001 From: NicJA Date: Tue, 12 Jun 2018 14:03:03 +0000 Subject: [PATCH] disable the unrecognized nls and x flags. move options into a separate variable to make it easier to read. git-svn-id: https://svn.aros.org/svn/aros/trunk/contrib@55318 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- development/libs/fontconfig/mmakefile.src | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/development/libs/fontconfig/mmakefile.src b/development/libs/fontconfig/mmakefile.src index bb8ad94aa..92e1e5e17 100644 --- a/development/libs/fontconfig/mmakefile.src +++ b/development/libs/fontconfig/mmakefile.src @@ -1,11 +1,17 @@ -# Copyright © 2009-2015, The AROS Development Team. All rights reserved. +# Copyright © 2009-2018, The AROS Development Team. All rights reserved. # $Id$ include $(SRCDIR)/config/aros-contrib.cfg #MM- contrib-fontconfig : linklibs workbench-libs-freetype-complete development-libxml2 development-fontconfig +FONTCONFIG_OPTIONS=--without-expat --enable-libxml2 --without-expat-lib --with-default-fonts=Fonts:TrueType \ + --disable-shared --disable-docs --with-arch=$(AROS_TARGET_CPU)-aros --localstatedir=/var \ + FREETYPE_CFLAGS='-I$(AROS_INCLUDES)/freetype' FREETYPE_LIBS='-L$(AROS_LIB) -lfreetype2' \ + LIBXML2_CFLAGS='-I$(AROS_INCLUDES)/libxml2' LIBXML2_LIBS='-L$(AROS_LIB) -lxml2 -lz' \ + lt_sys_lib_search_path_spec='$(AROS_DEVELOPER)/lib/' --libdir=$(AROS_LIB) + %fetch_and_build_gnu_development package=fontconfig version=2.11.1 \ srcdir=fontconfig-2.11.1 patch=yes suffixes="tar.gz" \ package_repo="http://fontconfig.org/release http://distfiles.macports.org/fontconfig http://repository.timesys.com/buildsources/f/fontconfig/fontconfig-2.6.0 http://www.freedesktop.org/software/fontconfig/release" \ - extraoptions="--without-expat --enable-libxml2 --without-expat-lib --with-default-fonts=Fonts:TrueType --disable-shared --disable-docs --with-arch=$(AROS_TARGET_CPU)-aros --localstatedir=/var FREETYPE_CFLAGS='-I$(AROS_INCLUDES)/freetype' FREETYPE_LIBS='-L$(AROS_LIB) -lfreetype2' LIBXML2_CFLAGS='-I$(AROS_INCLUDES)/libxml2' LIBXML2_LIBS='-L$(AROS_LIB) -lxml2 -lz' lt_sys_lib_search_path_spec='$(AROS_DEVELOPER)/lib/' --libdir=$(AROS_LIB)" + extraoptions="$(FONTCONFIG_OPTIONS)" nlsflag=no xflag=no -- 2.11.4.GIT