Commit 1d76aea5 authored by Bernie Purcell's avatar Bernie Purcell

Cross compilation of fontconfig was using incorrect header directories

parent 33be2aee
...@@ -444,16 +444,17 @@ fontconfig: fontconfig-$(FONTCONFIG_VERSION).tar.gz ...@@ -444,16 +444,17 @@ fontconfig: fontconfig-$(FONTCONFIG_VERSION).tar.gz
.fontconfig: fontconfig .fontconfig: fontconfig
ifdef HAVE_WIN32 ifdef HAVE_WIN32
ifdef HAVE_CYGWIN ifdef HAVE_CYGWIN
(cd $<; ./configure --target=$(HOST) --disable-pic --disable-shared --with-cache-dir=WINDOWSTEMPDIR --with-arch=i686 --prefix=$(PREFIX) && make && make install) (cd $<; LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure --target=$(HOST) --disable-pic --disable-shared --with-cache-dir=WINDOWSTEMPDIR --with-arch=i686 --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 && make && make install)
else else
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --with-cache-dir=WINDOWSTEMPDIR --with-arch=i686 --prefix=$(PREFIX) && make && make install) (cd $<; $(HOSTCC) LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure $(HOSTCONF) --with-cache-dir=WINDOWSTEMPDIR --with-arch=i686 --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 && make && make install)
endif endif
else else
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) (cd $<; $(HOSTCC) LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure $(HOSTCONF) --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 && make && make install)
endif endif
$(INSTALL_NAME) $(INSTALL_NAME)
touch $@ touch $@
CLEAN_FILE += .fontconfig CLEAN_FILE += .fontconfig
CLEAN_PKG += fontconfig CLEAN_PKG += fontconfig
DISTCLEAN_PKG += fontconfig-$(FONTCONFIG_VERSION).tar.gz DISTCLEAN_PKG += fontconfig-$(FONTCONFIG_VERSION).tar.gz
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment