[Libreoffice-commits] core.git: configure.ac external/fontconfig external/freetype RepositoryExternal.mk

[Caolán McNamara]

 RepositoryExternal.mk                             |    8 +++++---
 configure.ac                                      |    9 ++++++++-
 external/fontconfig/ExternalProject_fontconfig.mk |    2 +-
 external/fontconfig/Module_fontconfig.mk          |    4 ----
 external/freetype/Module_freetype.mk              |    4 ----
 5 files changed, 14 insertions(+), 13 deletions(-)

New commits:
commit 6cb661fba4a56782e521a4ede3db17d535f7cd4e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Dec 19 08:59:02 2016 +0000

    Revert "Revert "build our own fontconfig and freetype under oss-fuzz""
    
    This reverts commit d3c06fb90485543f6ca4b1f833e6c4f82b28ba14.
    
    which seems innocent after all

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index dcc47a6..3d5c5aa 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1273,7 +1273,7 @@ endef
 
 gb_ExternalProject__use_freetype :=
 
-else ifeq ($(OS),ANDROID)
+else
 
 define gb_LinkTarget__use_freetype_headers
 $(call gb_LinkTarget_use_external_project,$(1),freetype)
@@ -1286,7 +1286,7 @@ endef
 
 define gb_LinkTarget__use_freetype
 $(call gb_LinkTarget_use_external,$(1),freetype_headers)
-$(call gb_LinkTarget_add_libs,$(1),$(FREETYPE_LIBS))
+$(call gb_LinkTarget_add_libs,$(1),-lfreetype)
 
 endef
 
@@ -1309,7 +1309,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(FONTCONFIG_LIBS))
 
 endef
 
-else ifeq ($(OS),ANDROID)
+else
 
 define gb_LinkTarget__use_fontconfig
 $(call gb_LinkTarget_use_external_project,$(1),fontconfig)
@@ -1318,6 +1318,8 @@ $(call gb_LinkTarget_set_include,$(1),\
 	$$(INCLUDE) \
 )
 
+$(call gb_LinkTarget_add_libs,$(1),-lfontconfig)
+
 endef
 
 endif # SYSTEM_FONTCONFIG
diff --git a/configure.ac b/configure.ac
index 416547f..c55eef7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -661,7 +661,14 @@ linux-gnu*|k*bsd*-gnu*)
     build_gstreamer_0_10=yes
     test_tde=yes
     test_kde4=yes
-    test_freetype=yes
+    if test "$enable_fuzzers" != yes; then
+        test_freetype=yes
+        test_fontconfig=yes
+    else
+        test_freetype=no
+        test_fontconfig=no
+        BUILD_TYPE="$BUILD_TYPE FONTCONFIG FREETYPE"
+    fi
     _os=Linux
     ;;
 
diff --git a/external/fontconfig/ExternalProject_fontconfig.mk b/external/fontconfig/ExternalProject_fontconfig.mk
index e4de004..83387e3 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 764af35..e755f86 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 f6e316d..290014c 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: