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

Fix packaging with --disable-curl

Browse Source 
Change-Id: I9c3c1f1953c4d59c5a2d4c6017e73768d93a7bc7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159307
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
Mike Kaganski
2023-11-10 21:09:11 +03:00
parent 500def3076
commit cf53900ae8
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Repository.mk
View File

@@ -376,7 +376,7 @@ endif
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
avmedia \ avmedia \
LanguageTool \ $(if $(ENABLE_CURL),LanguageTool) \
$(call gb_Helper_optional,AVMEDIA, \ $(call gb_Helper_optional,AVMEDIA, \
$(if $(filter MACOSX,$(OS)),\ $(if $(filter MACOSX,$(OS)),\
avmediaMacAVF \ avmediaMacAVF \

3
RepositoryExternal.mk
View File

@@ -2737,9 +2737,10 @@ endef
else # !SYSTEM_CURL else # !SYSTEM_CURL
$(if $(ENABLE_CURL),\
$(eval $(call gb_Helper_register_packages_for_install,ooo,\ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
curl \ curl \
)) )))
define gb_LinkTarget__use_curl define gb_LinkTarget__use_curl
$(call gb_LinkTarget_use_package,$(1),curl) $(call gb_LinkTarget_use_package,$(1),curl)