Fix the minimal build-tools target

Desktop / LibreOffice - Jan-Marek Glogowski [fbihome.de] - 11 September 2020 16:34 UTC

The revert commits change the build-tools target for a DESKTOP build to build the complete LO. This restores the original, minimal one and also adds a whitelist of allowd build types.

OpenCL needs a configure switch, as it's status is also stored in a config header, so preventing the build is not enough.

This also reverts:- commit 802161a505272732566210e9ebbd8fe1b23fb86d- commit 02d931a59e2966d0c2736db8dee7be3e3dcd6bae

Change-Id: Ibfcb0c54e72da1b7c2e63c082ea6586520a787fa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102480

63972e79bbb9 Fix the minimal build-tools target
Makefile.gbuild | 5 -
Makefile.in | 2 +-
RepositoryExternal.mk | 2 +-
RepositoryModule_build.mk | 35 +++++++
configure.ac | 66 +++++++++++--
external/liblangtag/ExternalProject_liblangtag.mk | 3 +-
postprocess/CustomTarget_registry.mk | 5 +-
postprocess/Module_postprocess.mk | 9 +-
postprocess/Rdb_services.mk | 111 +++++++++++-----------
shell/Module_shell.mk | 11 ++-
solenv/gbuild/extensions/pre_BuildTools.mk | 2 +
solenv/gbuild/platform/com_MSC_class.mk | 13 +--
svx/Module_svx.mk | 5 +
unotest/Module_unotest.mk | 2 +
unoxml/Module_unoxml.mk | 5 +
vcl/Library_vcl.mk | 3 +
vcl/Library_vclplug_win.mk | 2 +
xmloff/Module_xmloff.mk | 5 +
18 files changed, 203 insertions(+), 83 deletions(-)

Upstream: cgit.freedesktop.org


  • Share