[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - external/Module_external.mk Repository.mk solenv/gbuild

[Matúš Kukan]

 Repository.mk                              |    2 +-
 external/Module_external.mk                |    7 -------
 solenv/gbuild/Helper.mk                    |    4 +++-
 solenv/gbuild/Module.mk                    |    2 ++
 solenv/gbuild/extensions/pre_BuildTools.mk |    3 +++
 5 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit c3bec2919fda97f37127c3656314a1441f19ce5a
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Wed Nov 30 14:36:51 2016 +0100

    gbuild: Prevent wrong use of gb_Helper_optional_for_host
    
    It's empty, unless gb_Side=build.
    This fixes commit 1193443b15b0e38cbfb41573b31acf9a8d90ce2c
    which removed icons used in our open dialog from image zip files.
    
    Also, include 985e93ecb44aef97995099d4fd5915afd3cab282
    "fix cross-toolset: gb_Helper_optional_for_host can't contain 'newline'"
    
    Reviewed-on: https://gerrit.libreoffice.org/31419
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    (cherry picked from commit 52d409f0d657f314a53f945c9ffb5b8025bea034)
    
    Change-Id: I83efad36d8f40c460d09ee1bd1addd7fb26c177b
    Reviewed-on: https://gerrit.libreoffice.org/31463
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/Repository.mk b/Repository.mk
index 48ce934..8030cf5 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -918,7 +918,7 @@ $(eval $(call gb_Helper_register_resources,\
 	eur \
 	for \
 	forui \
-	$(call gb_Helper_optional_for_host,DESKTOP,fps_office) \
+	$(call gb_Helper_optional,DESKTOP,fps_office) \
 	frm \
 	fwe \
 	gal \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 3b54b52..1dbf97b 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -101,13 +101,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,XSLTML,xsltml) \
 	$(call gb_Helper_optional,ZLIB,zlib) \
 	$(call gb_Helper_optional,ZMF,libzmf) \
-	$(call gb_Helper_optional_for_host,DESKTOP, \
-		$(if $(WITH_GALLERY_BUILD), \
-			$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
-			$(call gb_Helper_optional,LCMS2,lcms2) \
-			$(call gb_Helper_optional,NSS,nss) \
-		) \
-	) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 4e914d1..c3677c0 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -299,7 +299,9 @@ endef
 endif
 
 define gb_Helper_optional_for_host
-$(if $(filter $(1),$(BUILD_TYPE_FOR_HOST)),$(2))
+$(if $(filter build,$(gb_Side)), \
+	$(if $(filter $(1),$(BUILD_TYPE_FOR_HOST)),$(2)), \
+	$(call gb_Output_error,gb_Helper_optional_for_host: Use only when gb_Side=build))
 endef
 
 define gb_Helper_print_on_error
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index eb558a8..6af2b5c 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -144,10 +144,12 @@ $(call gb_Module_get_target,%) :
 
 all : build $(if $(CROSS_COMPILING),,unitcheck $(if $(gb_PARTIAL_BUILD),,slowcheck))
 
+ifeq ($(gb_Side),build)
 build-tools : $(gb_BUILD_TOOLS)
 	$(call gb_Output_announce,loaded tools: $(gb_BUILD_TOOLS),$(true),ALL,6)
 	$(call gb_Output_announce_title,build-tools done.)
 	$(call gb_Output_announce_bell)
+endif
 
 build :
 	$(call gb_Output_announce,top level modules: $(foreach module,$(filter-out deliverlog $(WORKDIR)/bootstrap,$^),$(notdir $(module))),$(true),ALL,6)
diff --git a/solenv/gbuild/extensions/pre_BuildTools.mk b/solenv/gbuild/extensions/pre_BuildTools.mk
index f387df6..5daf671 100644
--- a/solenv/gbuild/extensions/pre_BuildTools.mk
+++ b/solenv/gbuild/extensions/pre_BuildTools.mk
@@ -8,6 +8,7 @@
 #
 
 # Tools we need to build for cross-compiling
+ifeq ($(gb_Side),build)
 gb_BUILD_TOOLS = \
 	$(foreach executable, \
 		bestreversemap \
@@ -44,4 +45,6 @@ gb_BUILD_TOOLS = \
 	,$(call gb_ExternalExecutable_get_dependencies,$(executable))) \
 	$(INSTROOT)/$(LIBO_URE_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno) \
 
+endif
+
 # vim: set noet sw=4 ts=4: