ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

add --disable-librelogo to disable LibreLogo at build time

Browse Source 
Annoyingly the packinfo_*.txt don't support conditionals but we can
work-around that with a little duplication.

Change-Id: Id00a6831effcc63a917fc21d2cd201474fdb559d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109569
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
This commit is contained in:
Michael Stahl
2021-01-19 13:55:08 +01:00
parent 6f5186a94d
commit c18d3f8823
11 changed files with 90 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scp2/InstallModule_python.mk
+4 -3
View File
@@ -12,7 +12,7 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/python))
$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/python,\
python \
python_scriptprovider \
python_librelogo \
$(call gb_Helper_optional,LIBRELOGO,python_librelogo) \
))
ifeq ($(DISABLE_PYTHON),TRUE)
@@ -32,17 +32,18 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/python,\
$(eval $(call gb_InstallModule_add_defs,scp2/python,\
-DPYVERSION=$(PYTHON_VERSION) \
$(call gb_Helper_optional,LIBRELOGO,-DENABLE_LIBRELOGO=1) \
))
endif
$(eval $(call gb_InstallModule_add_scpfiles,scp2/python,\
scp2/source/python/file_python \
scp2/source/python/file_python_librelogo \
$(call gb_Helper_optional,LIBRELOGO,scp2/source/python/file_python_librelogo) \
scp2/source/python/module_python \
))
$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/python,\
scp2/source/python/module_python_librelogo \
$(call gb_Helper_optional,LIBRELOGO,scp2/source/python/module_python_librelogo) \
))
# vim: set shiftwidth=4 tabstop=4 noexpandtab: