configure.ac | 1 + external/serf/ExternalProject_serf.mk | 4 ++-- scp2/InstallModule_ooo.mk | 2 -- scp2/source/ooo/file_library_ooo.scp | 7 ++----- 4 files changed, 5 insertions(+), 9 deletions(-)
New commits: commit a13f4a0a18119e18b01fa7a5d6aa0b0a7c934b02 Author: Matúš Kukan <[email protected]> Date: Thu Apr 3 14:02:18 2014 +0200 DISABLE_NEON is not defined anymore Change-Id: I9a16cb47190204a10a80adc1ff9145b4b0dc9c8e diff --git a/configure.ac b/configure.ac index 288d2b6..69036cd 100644 --- a/configure.ac +++ b/configure.ac @@ -9303,6 +9303,7 @@ neon) libo_MINGW_TRY_DLL([libtasn1]) libo_MINGW_TRY_DLL([libgnutls]) else + SCPDEFS="$SCPDEFS -DNEED_NEON" NEON_VERSION=0295 fi AC_SUBST(NEON_VERSION) diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index 23705bf..3654aa7 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -22,7 +22,6 @@ $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/ooo,\ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ DISABLE_ATL \ - DISABLE_NEON \ ENABLE_CAIRO_CANVAS \ ENABLE_DIRECTX \ ENABLE_EVOAB2 \ @@ -61,7 +60,6 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ SYSTEM_LIBXSLT \ SYSTEM_LUCENE \ SYSTEM_MYTHES \ - SYSTEM_NEON \ SYSTEM_NSS \ SYSTEM_OPENSSL \ SYSTEM_PANGO \ diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 5a54ff8..94b2d56 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -298,11 +298,8 @@ File gid_File_Lib_Sysdtrans End #endif -#ifndef DISABLE_NEON -SPECIAL_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1) - #ifndef SYSTEM_NEON - SPECIAL_LIB_FILE(gid_File_Lib_Neon,neon) - #endif +#ifdef NEED_NEON +SPECIAL_LIB_FILE(gid_File_Lib_Neon,neon) #endif #if !defined(ANDROID) && !defined(IOS) //FIXME: get nss&xmlsec building commit c54846f81ec270fbbd9ef1dfc5df1075bc5cc58f Author: Matúš Kukan <[email protected]> Date: Thu Apr 3 13:53:50 2014 +0200 serf: SYSTEM_FOO is YES/NO here Change-Id: Id310f0f995998562b1217a3081bbfb0b3c545ac7 diff --git a/external/serf/ExternalProject_serf.mk b/external/serf/ExternalProject_serf.mk index afa2018..804d0bd 100644 --- a/external/serf/ExternalProject_serf.mk +++ b/external/serf/ExternalProject_serf.mk @@ -37,8 +37,8 @@ $(call gb_ExternalProject_get_state_target,serf,build): ./configure SERF_LIBS= \ --enable-option-checking=fatal \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM))\ - $(if $(SYSTEM_APR),,--with-apr=$(call gb_UnpackedTarball_get_dir,apr)/apr-1-config) \ - $(if $(SYSTEM_APR),,--with-apr-util=$(call gb_UnpackedTarball_get_dir,apr_util)/apu-1-config) \ + $(if $(filter YES,$(SYSTEM_APR)),,--with-apr=$(call gb_UnpackedTarball_get_dir,apr)/apr-1-config) \ + $(if $(filter YES,$(SYSTEM_APR)),,--with-apr-util=$(call gb_UnpackedTarball_get_dir,apr_util)/apu-1-config) \ $(if $(SYSTEM_OPENSSL),,--with-openssl=$(call gb_UnpackedTarball_get_dir,openssl)) \ && $(MAKE) libserf-1.la \ )
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
