[Libreoffice-commits] core.git: cui/Library_cui.mk

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon Oct 8 12:29:20 UTC 2018


 cui/Library_cui.mk |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 2f74b6842f56dc0313022bc0e51472342b0515a6
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Oct 8 12:37:27 2018 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Oct 8 14:28:59 2018 +0200

    Try to manage without curl on non-desktop platforms (iOS, for me)
    
    We don't build curl for iOS. (Don't remember why exactly, but anyway,
    this persona thing is surely a feature relevant for desktop platforms
    only, and certainly not a good reason to start building curl.)
    
    Change-Id: Ia2acebe77a0acb9dbf5858e6524c444e772ac8c8
    Reviewed-on: https://gerrit.libreoffice.org/61520
    Tested-by: Jenkins
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index 26900dec8e3a..a959742a906c 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -66,7 +66,8 @@ $(eval $(call gb_Library_use_externals,cui,\
 	boost_headers \
 	$(call gb_Helper_optional,OPENCL,\
 		clew) \
-    curl \
+    $(call gb_Helper_optional,DESKTOP,\
+		curl) \
     icuuc \
     icu_headers \
     orcus-parser \
@@ -174,7 +175,8 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
     cui/source/options/optpath \
     cui/source/options/optsave \
     cui/source/options/optupdt \
-    cui/source/options/personalization \
+    $(call gb_Helper_optional,DESKTOP,\
+        cui/source/options/personalization) \
     cui/source/options/personasdochandler \
     cui/source/options/radiobtnbox \
     cui/source/options/sdbcdriverenum \


More information about the Libreoffice-commits mailing list