diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-02-04 22:24:20 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-02-05 08:35:38 +0000 |
| commit | 5a0aabe7b38825d584b9c134c0e96927cb6dd50c (patch) | |
| tree | cfd9614f0ef81277dfe0d93a600ab1244ceb3afe /external/freetype | |
| parent | 0d016fc9e784d65802e117dec0afbf2a2d66cc10 (diff) | |
circular freetype and harfbuzz dependency
harfbuzz needs freetype, freetype wants harfbuzz but can live
without it
Change-Id: I4b5dbd937ccfc9af46c86be5ae1d3f8eeb14e86b
Diffstat (limited to 'external/freetype')
| -rw-r--r-- | external/freetype/ExternalProject_freetype.mk | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/external/freetype/ExternalProject_freetype.mk b/external/freetype/ExternalProject_freetype.mk index b12303c61c8e..1980637cd6de 100644 --- a/external/freetype/ExternalProject_freetype.mk +++ b/external/freetype/ExternalProject_freetype.mk @@ -9,10 +9,6 @@ $(eval $(call gb_ExternalProject_ExternalProject,freetype)) -$(eval $(call gb_ExternalProject_use_externals,freetype,\ - harfbuzz \ -)) - $(eval $(call gb_ExternalProject_register_targets,freetype,\ build \ )) @@ -30,6 +26,7 @@ $(call gb_ExternalProject_get_state_target,freetype,build) : --disable-shared \ --without-zlib \ --without-bzip2 \ + --without-harfbuzz \ --prefix=$(call gb_UnpackedTarball_get_dir,freetype/instdir) \ --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ CFLAGS="$(if $(debug),-g) $(gb_VISIBILITY_FLAGS)" \ |