diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2017-10-30 22:15:19 +0100 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2017-10-31 15:38:14 +0100 |
| commit | 71d9a61302e65fe091cf70c13fa72b3df09b7e3a (patch) | |
| tree | a600a2047288a75b2137d2c6a2ae2ab66565e03d /external/msc-externals | |
| parent | b8d1944111bad07c105e94c82baf5f699a5b9688 (diff) | |
tdf#108580 ship universal crts with the program as workaround
the universal crts redistributables are available as part of the Windows
10 SDK. Point to the dir (or a copy of the dir) using --with-ucrt-dir
Use --without-ucrt-dir (or --with-ucrt-dir=no) if you don't want to ship
them as part of LO and are annoyed by the configure warning.
Change-Id: I5487e3f6e583222fa053b2fc03176f061d57746c
Reviewed-on: https://gerrit.libreoffice.org/44074
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'external/msc-externals')
| -rw-r--r-- | external/msc-externals/Module_msc-externals.mk | 11 | ||||
| -rw-r--r-- | external/msc-externals/Package_ucrt.mk | 16 |
2 files changed, 27 insertions, 0 deletions
diff --git a/external/msc-externals/Module_msc-externals.mk b/external/msc-externals/Module_msc-externals.mk index 2fa56b458e71..9435d5d96059 100644 --- a/external/msc-externals/Module_msc-externals.mk +++ b/external/msc-externals/Module_msc-externals.mk @@ -17,4 +17,15 @@ $(eval $(call gb_Module_add_targets,msc-externals,\ endif +# TODO: hackaround to install the universal crts locally (tdf#108580) +# ideally we can create a chained installer or similar that installs them +# systemwide using windows update +ifneq ($(UCRT_REDISTDIR),) + +$(eval $(call gb_Module_add_targets,msc-externals,\ + Package_ucrt \ +)) + +endif + # vim: set noet sw=4 ts=4: diff --git a/external/msc-externals/Package_ucrt.mk b/external/msc-externals/Package_ucrt.mk new file mode 100644 index 000000000000..05d51d369f47 --- /dev/null +++ b/external/msc-externals/Package_ucrt.mk @@ -0,0 +1,16 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Package_Package,ucrt,$(UCRT_REDISTDIR))) + +$(eval $(call gb_Package_add_files,ucrt,program,\ + $(UCRT_DLLS) \ +)) + +# vim:set shiftwidth=4 tabstop=4 noexpandtab: |