[Libreoffice-commits] core.git: desktop/Library_sofficeapp.mk

jan Iversen jani at libreoffice.org
Tue May 23 17:06:16 UTC 2017


 desktop/Library_sofficeapp.mk |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 7a447a8c60113f53b237b633b940a761188a3885
Author: jan Iversen <jani at libreoffice.org>
Date:   Tue May 23 19:03:15 2017 +0200

    iOS, remove curl to make iOS compile
    
    Commit 9c3b05f2d571b58ee2322a942162ecec654544dc
    added curl, without affect on iOS
    some of the conditions changed later
    making curl be included when compiling iOS
    
    Added filter_out macro for iOS
    
    Change-Id: I22a9ffd47f56893ea366fffa3ef0a0610ea54370

diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index 6998060d92dc..7b76aedc4d33 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -31,7 +31,9 @@ $(eval $(call gb_Library_use_externals,sofficeapp, \
     icu_headers \
     icui18n \
     icuuc \
+    $(if $(filter-out IOS,$(OS)), \
     curl \
+    )\
     $(if $(ENABLE_ONLINE_UPDATE_MAR),\
         orcus-parser \
         orcus )\


More information about the Libreoffice-commits mailing list