[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, 13 insertions(+), 14 deletions(-)

New commits:
commit d3c06fb90485543f6ca4b1f833e6c4f82b28ba14
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Dec 16 17:19:39 2016 +0000

    Revert "build our own fontconfig and freetype under oss-fuzz"
    
    did I break android here mysteriously
    
    This reverts commit f2fae3684f35bfb03c4921adc4ecbddcff36374b.
    
    Change-Id: I0d941d3e474c6693cd15e1b55baab83a3da48488

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 3d5c5aa..dcc47a6 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1273,7 +1273,7 @@ endef
 
 gb_ExternalProject__use_freetype :=
 
-else
+else ifeq ($(OS),ANDROID)
 
 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),-lfreetype)
+$(call gb_LinkTarget_add_libs,$(1),$(FREETYPE_LIBS))
 
 endef
 
@@ -1309,7 +1309,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(FONTCONFIG_LIBS))
 
 endef
 
-else
+else ifeq ($(OS),ANDROID)
 
 define gb_LinkTarget__use_fontconfig
 $(call gb_LinkTarget_use_external_project,$(1),fontconfig)
@@ -1318,8 +1318,6 @@ $(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 3e58408..20cd80e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -661,14 +661,7 @@ linux-gnu*|k*bsd*-gnu*)
     build_gstreamer_0_10=yes
     test_tde=yes
     test_kde4=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
+    test_freetype=yes
     _os=Linux
     ;;
 
diff --git a/external/fontconfig/ExternalProject_fontconfig.mk b/external/fontconfig/ExternalProject_fontconfig.mk
index 83387e3..e4de004 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 \
-			$(if $(filter ANDROID,$(OS)),--with-arch=arm) \
+			--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 e755f86..764af35 100644
--- a/external/fontconfig/Module_fontconfig.mk
+++ b/external/fontconfig/Module_fontconfig.mk
@@ -9,9 +9,13 @@
 
 $(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 290014c..f6e316d 100644
--- a/external/freetype/Module_freetype.mk
+++ b/external/freetype/Module_freetype.mk
@@ -9,9 +9,13 @@
 
 $(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: