Repository.mk | 2 +- RepositoryExternal.mk | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-)
New commits: commit fac623a8b844ffd42bd6318dba91e9253268198d Author: Mike Kaganski <[email protected]> AuthorDate: Fri Nov 10 21:10:11 2023 +0300 Commit: Mike Kaganski <[email protected]> CommitDate: Fri Nov 10 21:38:08 2023 +0100 Fix packaging with --enable-mpl-subset Change-Id: I1cae9e9a9837df968663b6f46bd1e0d369377126 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159308 Tested-by: Jenkins Reviewed-by: Mike Kaganski <[email protected]> diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 46b1c1bb70ed..9659ec7c163f 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3057,9 +3057,10 @@ endef else # !SYSTEM_POSTGRESQL ifeq ($(OS),WNT) +$(if $(MPL_SUBSET),,\ $(eval $(call gb_Helper_register_packages_for_install,postgresqlsdbc,\ postgresql \ -)) +))) endif # WNT define gb_LinkTarget__use_postgresql commit cf53900ae8f25529a001602d56fd2f08b6bdde3a Author: Mike Kaganski <[email protected]> AuthorDate: Fri Nov 10 21:09:11 2023 +0300 Commit: Mike Kaganski <[email protected]> CommitDate: Fri Nov 10 21:38:00 2023 +0100 Fix packaging with --disable-curl Change-Id: I9c3c1f1953c4d59c5a2d4c6017e73768d93a7bc7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159307 Tested-by: Jenkins Reviewed-by: Mike Kaganski <[email protected]> diff --git a/Repository.mk b/Repository.mk index 72a88d3e8429..b9cf9c2ddb9c 100644 --- a/Repository.mk +++ b/Repository.mk @@ -376,7 +376,7 @@ endif $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ avmedia \ - LanguageTool \ + $(if $(ENABLE_CURL),LanguageTool) \ $(call gb_Helper_optional,AVMEDIA, \ $(if $(filter MACOSX,$(OS)),\ avmediaMacAVF \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 0eddf400a77c..46b1c1bb70ed 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2737,9 +2737,10 @@ endef else # !SYSTEM_CURL +$(if $(ENABLE_CURL),\ $(eval $(call gb_Helper_register_packages_for_install,ooo,\ curl \ -)) +))) define gb_LinkTarget__use_curl $(call gb_LinkTarget_use_package,$(1),curl)
