mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gbuild: Prevent wrong use of gb_Helper_optional_for_host

Browse Source 
It's empty, unless gb_Side=build.
This fixes commit 1193443b15

Change-Id: I83efad36d8f40c460d09ee1bd1addd7fb26c177b
Reviewed-on: https://gerrit.libreoffice.org/31419
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
This commit is contained in:
Matúš Kukan
2016-11-30 14:36:51 +01:00
committed by Michael Stahl
parent 61f61e7723
commit 52d409f0d6
5 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Repository.mk
View File

@@ -992,7 +992,7 @@ $(eval $(call gb_Helper_register_resources,\
eur \ eur \
for \ for \
forui \ forui \
$(call gb_Helper_optional_for_host,DESKTOP,fps_office) \ $(call gb_Helper_optional,DESKTOP,fps_office) \
frm \ frm \
fwe \ fwe \
gal \ gal \

7
external/Module_external.mk vendored
View File

@@ -101,13 +101,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,XSLTML,xsltml) \ $(call gb_Helper_optional,XSLTML,xsltml) \
$(call gb_Helper_optional,ZLIB,zlib) \ $(call gb_Helper_optional,ZLIB,zlib) \
$(call gb_Helper_optional,ZMF,libzmf) \ $(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: # vim: set noet sw=4 ts=4:

1
solenv/gbuild/Helper.mk
View File

@@ -299,6 +299,7 @@ endef
endif endif
define gb_Helper_optional_for_host define gb_Helper_optional_for_host
$(if $(filter build,$(gb_Side)),,$(call gb_Output_error,gb_Helper_optional_for_host: Use only when gb_Side=build))
$(if $(filter $(1),$(BUILD_TYPE_FOR_HOST)),$(2)) $(if $(filter $(1),$(BUILD_TYPE_FOR_HOST)),$(2))
endef endef

2
solenv/gbuild/Module.mk
View File

@@ -144,10 +144,12 @@ $(call gb_Module_get_target,%) :
all : build $(if $(CROSS_COMPILING),,unitcheck $(if $(gb_PARTIAL_BUILD),,slowcheck)) all : build $(if $(CROSS_COMPILING),,unitcheck $(if $(gb_PARTIAL_BUILD),,slowcheck))
ifeq ($(gb_Side),build)
build-tools : $(gb_BUILD_TOOLS) build-tools : $(gb_BUILD_TOOLS)
$(call gb_Output_announce,loaded tools: $(gb_BUILD_TOOLS),$(true),ALL,6) $(call gb_Output_announce,loaded tools: $(gb_BUILD_TOOLS),$(true),ALL,6)
$(call gb_Output_announce_title,build-tools done.) $(call gb_Output_announce_title,build-tools done.)
$(call gb_Output_announce_bell) $(call gb_Output_announce_bell)
endif
build : build :
$(call gb_Output_announce,top level modules: $(foreach module,$(filter-out deliverlog $(WORKDIR)/bootstrap,$^),$(notdir $(module))),$(true),ALL,6) $(call gb_Output_announce,top level modules: $(foreach module,$(filter-out deliverlog $(WORKDIR)/bootstrap,$^),$(notdir $(module))),$(true),ALL,6)

3
solenv/gbuild/extensions/pre_BuildTools.mk
View File

@@ -8,6 +8,7 @@
# #
# Tools we need to build for cross-compiling # Tools we need to build for cross-compiling
ifeq ($(gb_Side),build)
gb_BUILD_TOOLS = \ gb_BUILD_TOOLS = \
$(foreach executable, \ $(foreach executable, \
bestreversemap \ bestreversemap \
@@ -44,4 +45,6 @@ gb_BUILD_TOOLS = \
,$(call gb_ExternalExecutable_get_dependencies,$(executable))) \ ,$(call gb_ExternalExecutable_get_dependencies,$(executable))) \
$(INSTROOT)/$(LIBO_URE_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno) \ $(INSTROOT)/$(LIBO_URE_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno) \
endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4: