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

[Zolnai Tamás]

 configure.ac                                  |    2 +-
 external/freetype/ExternalProject_freetype.mk |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 68617a21a26a3cf9daa35b1f31f3b8f4aa56ddd0
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Sun Apr 20 12:06:54 2014 +0200

    Disable gltf support on mac until freetype build problems are fixed
    
    This reverts commit 68baa264a5c36f99bf946fae92e0faef53b737f3.
    
    Change-Id: Iea889a3188783f6c0d853f04e2b43442e0a692cc

diff --git a/configure.ac b/configure.ac
index 2ab350f..b6c4584 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10368,7 +10368,7 @@ dnl ===================================================================
 
 ENABLE_GLTF=
 AC_MSG_CHECKING([whether to enable glTF support])
-if test $_os != iOS -a $_os != Android -a $_os != WINNT -a "x$enable_gltf" != "xno"; then
+if test $_os != iOS -a $_os != Android -a $_os != WINNT -a $_os != MACOSX -a "x$enable_gltf" != "xno"; then
     ENABLE_GLTF=TRUE
     AC_MSG_RESULT([yes])
     BUILD_TYPE="$BUILD_TYPE LIBGLTF"
diff --git a/external/freetype/ExternalProject_freetype.mk b/external/freetype/ExternalProject_freetype.mk
index a9dbef6..464a221 100644
--- a/external/freetype/ExternalProject_freetype.mk
+++ b/external/freetype/ExternalProject_freetype.mk
@@ -29,8 +29,7 @@ $(call gb_ExternalProject_get_state_target,freetype,build) :
 			--without-bzip2 \
 			--prefix=$(call gb_UnpackedTarball_get_dir,freetype/instdir) \
 			--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
-			CFLAGS="$(if $(debug),-g) $(gb_VISIBILITY_FLAGS) $(if $(filter MACOSX,$(OS)),-arch i386 -arch x86_64)" \
-			$(if $(filter MACOSX,$(OS)),LDFLAGS="-arch i386 -arch x86_64") \
+			CFLAGS="$(if $(debug),-g) $(gb_VISIBILITY_FLAGS)" \
 		&& chmod +x builds/unix/freetype-config \
 		&& $(MAKE) install \
 		&& touch $@	)