diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-10-24 23:12:32 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-10-24 23:14:24 +0300 |
| commit | 49f6c5907a2ec8c1886e3157de2c843d332aabcf (patch) | |
| tree | b14b13a52a6e176ce6e8d9e4e8b8a092f60f4366 /external | |
| parent | 01a51764c5eff1c883d3a19381ab4d8971471492 (diff) | |
Fix freetype and fontconfig problems
We need to do a "make install" in freetype so that what freetype-config --libs
outputs is correct. We don't use freetype-config ourselves but fontconfig
does, and it builds some test programs.
The bundled freetype and fontconfig are built only for Android.
Change-Id: Ib622cc48a0c4eb6a72188bc83c8d36b39f97fdca
Diffstat (limited to 'external')
| -rw-r--r-- | external/fontconfig/ExternalProject_fontconfig.mk | 2 | ||||
| -rw-r--r-- | external/freetype/ExternalProject_freetype.mk | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/external/fontconfig/ExternalProject_fontconfig.mk b/external/fontconfig/ExternalProject_fontconfig.mk index 74438d09d54b..e4de004bdc34 100644 --- a/external/fontconfig/ExternalProject_fontconfig.mk +++ b/external/fontconfig/ExternalProject_fontconfig.mk @@ -26,7 +26,7 @@ $(call gb_ExternalProject_get_state_target,fontconfig,build) : --with-arch=arm \ --with-expat-includes=$(call gb_UnpackedTarball_get_dir,expat)/lib \ --with-expat-lib=$(gb_StaticLibrary_WORKDIR) \ - --with-freetype-config=$(call gb_UnpackedTarball_get_dir,freetype)/builds/unix/freetype-config \ + --with-freetype-config=$(call gb_UnpackedTarball_get_dir,freetype)/instdir/bin/freetype-config \ --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ && $(MAKE) \ ) diff --git a/external/freetype/ExternalProject_freetype.mk b/external/freetype/ExternalProject_freetype.mk index ba22a64838f0..aa9a1b7ee03a 100644 --- a/external/freetype/ExternalProject_freetype.mk +++ b/external/freetype/ExternalProject_freetype.mk @@ -20,10 +20,10 @@ $(call gb_ExternalProject_get_state_target,freetype,build) : --disable-shared \ --without-zlib \ --without-bzip2 \ - --prefix=$(OUTDIR) --includedir=$(call gb_UnpackedTarball_get_dir,freetype)/include \ + --prefix=$(call gb_UnpackedTarball_get_dir,freetype/instdir) \ --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ && chmod +x builds/unix/freetype-config \ - && $(MAKE) \ + && $(MAKE) install \ && touch $@ # vim: set noet sw=4 ts=4: |