diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-12-13 16:30:58 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-12-15 09:28:03 +0000 |
| commit | f2fae3684f35bfb03c4921adc4ecbddcff36374b (patch) | |
| tree | 8bebff39b8b346fa246b37f549e5152eaa842dae /external | |
| parent | 7f9a389b45e2452d859e17cf51acd27dc7355af6 (diff) | |
build our own fontconfig and freetype under oss-fuzz
Change-Id: I7141aabd64c3f42545176fa8c907d8326e25e9ff
Diffstat (limited to 'external')
| -rw-r--r-- | external/fontconfig/ExternalProject_fontconfig.mk | 2 | ||||
| -rw-r--r-- | external/fontconfig/Module_fontconfig.mk | 4 | ||||
| -rw-r--r-- | external/freetype/Module_freetype.mk | 4 |
3 files changed, 1 insertions, 9 deletions
diff --git a/external/fontconfig/ExternalProject_fontconfig.mk b/external/fontconfig/ExternalProject_fontconfig.mk index e4de004bdc34..83387e31e7ef 100644 --- a/external/fontconfig/ExternalProject_fontconfig.mk +++ b/external/fontconfig/ExternalProject_fontconfig.mk @@ -23,7 +23,7 @@ $(call gb_ExternalProject_get_state_target,fontconfig,build) : CFLAGS="$(if $(debug),-g) $(gb_VISIBILITY_FLAGS)" $(if $(filter ANDROID,$(OS)),LIBS="-lm") \ ./configure \ --disable-shared \ - --with-arch=arm \ + $(if $(filter ANDROID,$(OS)),--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)/instdir/bin/freetype-config \ diff --git a/external/fontconfig/Module_fontconfig.mk b/external/fontconfig/Module_fontconfig.mk index 764af35cdb6e..e755f8610db1 100644 --- a/external/fontconfig/Module_fontconfig.mk +++ b/external/fontconfig/Module_fontconfig.mk @@ -9,13 +9,9 @@ $(eval $(call gb_Module_Module,fontconfig)) -ifeq ($(OS),ANDROID) - $(eval $(call gb_Module_add_targets,fontconfig,\ ExternalProject_fontconfig \ UnpackedTarball_fontconfig \ )) -endif - # vim: set noet sw=4 ts=4: diff --git a/external/freetype/Module_freetype.mk b/external/freetype/Module_freetype.mk index f6e316d9f8bc..290014c47dfd 100644 --- a/external/freetype/Module_freetype.mk +++ b/external/freetype/Module_freetype.mk @@ -9,13 +9,9 @@ $(eval $(call gb_Module_Module,freetype)) -ifneq (,$(or $(findstring ANDROID,$(OS)),$(ENABLE_GLTF))) - $(eval $(call gb_Module_add_targets,freetype,\ ExternalProject_freetype \ UnpackedTarball_freetype \ )) -endif - # vim: set noet sw=4 ts=4: |