diff options
author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2017-10-30 22:15:19 +0100 |
---|---|---|
committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2017-11-02 22:57:29 +0100 |
commit | 67940d53fd68283c7dbc70897063c33d5ede49df (patch) | |
tree | 45bb82b08ceeb823689144234dbd373f8391a7d1 /Repository.mk | |
parent | 801a761c4f9a237ae7879e37ca043aa3e587a10c (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>
(cherry picked from commit 71d9a61302e65fe091cf70c13fa72b3df09b7e3a)
Reviewed-on: https://gerrit.libreoffice.org/44122
Diffstat (limited to 'Repository.mk')
-rw-r--r-- | Repository.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Repository.mk b/Repository.mk index 184f5661ee10..a1e9cb7b6cf1 100644 --- a/Repository.mk +++ b/Repository.mk @@ -834,6 +834,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ure,\ jvmfwk_jreproperties \ $(if $(filter MACOSX,$(OS)),bridges_jnilib_java_uno) \ ) \ + $(if $(UCRT_REDISTDIR),ucrt) \ )) $(eval $(call gb_Helper_register_packages_for_install,postgresqlsdbc,\ |