diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-11-08 16:05:15 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-11-08 16:09:49 +0200 |
| commit | 6063fd0402e0b63aec4a6740e94e4f76fcc312c1 (patch) | |
| tree | 43773d5af10e496000805e7e7e6d60731a9812e5 | |
| parent | 62b4827f238acabd970a98272967d7c2b0545ea2 (diff) | |
fontconfig's configure looks for <expat.h>
So we need to use the expat subdir too in
--with-expat-includes. Apparently until now it did not find expat.h,
so it fell back to libxml2 instead then, which was sometimes found OK,
sometimes (on tinderboxes) not. (It even went looking in the *build*
platform /usr/include, eek!)
Change-Id: If0595b810d531b5aa7110f375d4d0dfb0b01617b
| -rw-r--r-- | fontconfig/ExternalProject_fontconfig.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fontconfig/ExternalProject_fontconfig.mk b/fontconfig/ExternalProject_fontconfig.mk index 296db712a202..c0b18787ed4d 100644 --- a/fontconfig/ExternalProject_fontconfig.mk +++ b/fontconfig/ExternalProject_fontconfig.mk @@ -24,7 +24,7 @@ $(call gb_ExternalProject_get_state_target,fontconfig,build) : && $(if $(debug),CFLAGS=-g) $(if $(filter ANDROID,$(OS)),LIBS="-lm") ./configure \ --disable-shared \ --with-arch=arm \ - --with-expat-includes=$(OUTDIR)/inc/external \ + --with-expat-includes=$(OUTDIR)/inc/external/expat \ --with-expat-lib=$(OUTDIR)/lib \ --with-freetype-config=$(OUTDIR)/bin/freetype-config \ --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ |