Repository.mk | 2 +- RepositoryExternal.mk | 4 ++-- sal/Library_sal.mk | 12 ++---------- sal/Module_sal.mk | 2 +- solenv/gbuild/Conditions.mk | 4 ++++ 5 files changed, 10 insertions(+), 14 deletions(-)
New commits: commit bd1868c1057f0582f1a733bb90eca0c1c7e07933 Author: Jan-Marek Glogowski <glo...@fbihome.de> AuthorDate: Mon Dec 13 18:21:11 2021 +0100 Commit: Jan-Marek Glogowski <glo...@fbihome.de> CommitDate: Thu Dec 16 11:17:08 2021 +0100 Refactor Library_sal_textenc build condition ... by adding and using gb_CondSalTextEncodingLibrary. Change-Id: I04e8f56bde6296477d449f1c447e8133cdf86e6e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126788 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glo...@fbihome.de> diff --git a/Repository.mk b/Repository.mk index 91e8780a01ba..018628e6d9ec 100644 --- a/Repository.mk +++ b/Repository.mk @@ -612,7 +612,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PRIVATELIBS_URE,ure, \ )) $(eval $(call gb_Helper_register_plugins_for_install,PRIVATELIBS_URE,ure, \ - sal_textenc \ + $(call gb_CondSalTextEncodingLibrary,sal_textenc) \ )) $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 5569aa0f1027..e24e35150713 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3800,7 +3800,7 @@ endif # SYSTEM_JFREEREPORT define gb_Executable__register_bestreversemap $(call gb_Executable_add_runtime_dependencies,bestreversemap,\ - $(if $(filter $(OS),ANDROID),,$(if $(filter TRUE,$(DISABLE_DYNLOADING)),,$(call gb_Library_get_target_for_build,sal_textenc))) \ + $(call gb_CondSalTextEncodingLibrary,$(call gb_Library_get_target_for_build,sal_textenc)) \ ) endef @@ -3817,7 +3817,7 @@ endef define gb_Executable__register_cppumaker $(call gb_Executable_add_runtime_dependencies,cppumaker,\ - $(if $(filter $(OS),ANDROID),,$(if $(filter TRUE,$(DISABLE_DYNLOADING)),,$(call gb_Library_get_target,sal_textenc))) \ + $(call gb_CondSalTextEncodingLibrary,$(call gb_Library_get_target,sal_textenc)) \ ) endef diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index a323aedaa7b1..ac121098273f 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -130,7 +130,8 @@ $(eval $(call gb_Library_add_cxxflags,sal,\ )) endif -sal_textenc_code= \ +ifeq (,$(call gb_CondSalTextEncodingLibrary,$(true))) +$(eval $(call gb_Library_add_exception_objects,sal,\ sal/textenc/context \ sal/textenc/convertbig5hkscs \ sal/textenc/converteuctw \ @@ -144,15 +145,6 @@ sal_textenc_code= \ sal/textenc/tcvtbyte \ sal/textenc/tcvtmb \ sal/textenc/tcvtutf7 \ - -ifeq ($(OS),ANDROID) -$(eval $(call gb_Library_add_exception_objects,sal,\ - $(sal_textenc_code) \ -)) -else ifeq ($(DISABLE_DYNLOADING),TRUE) - -$(eval $(call gb_Library_add_exception_objects,sal,\ - $(sal_textenc_code) \ )) endif diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk index 1a190037f05b..19bf547ad572 100644 --- a/sal/Module_sal.mk +++ b/sal/Module_sal.mk @@ -14,7 +14,7 @@ $(eval $(call gb_Module_add_targets,sal,\ $(if $(filter $(OS),ANDROID), \ Library_lo-bootstrap) \ Library_sal \ - $(if $(filter $(OS),ANDROID),,$(if $(filter TRUE,$(DISABLE_DYNLOADING)),,Library_sal_textenc)) \ + $(call gb_CondSalTextEncodingLibrary,Library_sal_textenc) \ )) ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) diff --git a/solenv/gbuild/Conditions.mk b/solenv/gbuild/Conditions.mk index bf81215f25eb..88e705524d65 100644 --- a/solenv/gbuild/Conditions.mk +++ b/solenv/gbuild/Conditions.mk @@ -11,4 +11,8 @@ define gb_CondBuildLockfile $(if $(and $(filter-out ANDROID MACOSX iOS WNT,$(OS))),$(1),$(2)) endef +define gb_CondSalTextEncodingLibrary +$(if $(filter ANDROID,$(OS)),,$(if $(DISABLE_DYNLOADING),$(2),$(1))) +endef + # vim: set noet sw=4 ts=4: