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

Don't build the static uno binary

Browse Source 
Change-Id: If6d5384d4692fba94070bb11bb5a47a66b813f58
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128135
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
This commit is contained in:
Jan-Marek Glogowski
2022-01-08 06:46:13 +01:00
parent 692838e958
commit 92a90cf5cc
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Repository.mk
View File

@@ -239,7 +239,7 @@ $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\
regmerge \ regmerge \
regview \ regview \
) \ ) \
$(if $(filter DESKTOP,$(BUILD_TYPE)),uno) \ $(call gb_CondExeUno,uno) \
)) ))
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,base, \ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,base, \

9
cpputools/Module_cpputools.mk
View File

@@ -9,16 +9,9 @@
$(eval $(call gb_Module_Module,cpputools)) $(eval $(call gb_Module_Module,cpputools))
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,cpputools,\ $(eval $(call gb_Module_add_targets,cpputools,\
$(call gb_CondExeSp2bv,Executable_sp2bv) \ $(call gb_CondExeSp2bv,Executable_sp2bv) \
$(call gb_CondExeUno,Executable_uno) \
)) ))
$(eval $(call gb_Module_add_targets,cpputools,\
Executable_uno \
))
endif
# vim:set noet sw=4 ts=4: # vim:set noet sw=4 ts=4:

4
solenv/gbuild/Conditions.mk
View File

@@ -23,6 +23,10 @@ define gb_CondExeSp2bv
$(if $(and $(filter WNT,$(OS)),$(call gb_Helper_optionals_and,DESKTOP ODK,$(true))),$(1),$(2)) $(if $(and $(filter WNT,$(OS)),$(call gb_Helper_optionals_and,DESKTOP ODK,$(true))),$(1),$(2))
endef endef
define gb_CondExeUno
$(if $(and $(filter DESKTOP,$(BUILD_TYPE)),$(if $(DISABLE_DYNLOADING),,$(true))),$(1),$(2))
endef
define gb_CondSalTextEncodingLibrary define gb_CondSalTextEncodingLibrary
$(if $(filter ANDROID,$(OS)),,$(if $(DISABLE_DYNLOADING),$(2),$(1))) $(if $(filter ANDROID,$(OS)),,$(if $(DISABLE_DYNLOADING),$(2),$(1)))
endef endef