diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-09-30 10:51:27 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-09-30 10:51:27 +0300 |
| commit | 514414ca2845d62056730c72fd2c14cbb5ba19c0 (patch) | |
| tree | 16c84cebbefcf7e54556d17a4766bf05f3127c17 /fontconfig | |
| parent | b241c355aaa03e51d843cb095985c2bb7a89cd85 (diff) | |
Fix up the expat dependency
Change-Id: I426779bbe0308a4e1c3bc567fe2ca67805d95e55
Diffstat (limited to 'fontconfig')
| -rw-r--r-- | fontconfig/ExternalProject_fontconfig.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fontconfig/ExternalProject_fontconfig.mk b/fontconfig/ExternalProject_fontconfig.mk index b520a118fc19..64ccbe62a603 100644 --- a/fontconfig/ExternalProject_fontconfig.mk +++ b/fontconfig/ExternalProject_fontconfig.mk @@ -10,6 +10,7 @@ $(eval $(call gb_ExternalProject_ExternalProject,fontconfig)) $(eval $(call gb_ExternalProject_use_packages,fontconfig,\ + expat \ freetype \ )) @@ -24,7 +25,7 @@ $(call gb_ExternalProject_get_state_target,fontconfig,build) : --disable-shared \ --with-arch=arm \ --with-expat-includes=$(call gb_UnpackedTarball_get_dir,expat)/lib \ - --with-expat-lib=$(OUTDIR)/lib \ + --with-expat-lib=$(gb_StaticLibrary_WORKDIR) \ --with-freetype-config=$(OUTDIR)/bin/freetype-config \ --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ && $(MAKE) \ |