diff options
author | Michael Stahl <michael.stahl@allotropia.de> | 2022-04-06 21:39:45 +0200 |
---|---|---|
committer | Michael Stahl <michael.stahl@allotropia.de> | 2022-05-12 14:07:04 +0200 |
commit | 9c6eeecfb9eb39a6a5f7b394163f15d261d55a80 (patch) | |
tree | 12a1d3a43bf8bb24cf0199be185fcfda9cabec06 | |
parent | Prevent save interception when un-sharing Calc doc (diff) | |
download | core-9c6eeecfb9eb39a6a5f7b394163f15d261d55a80.tar.gz core-9c6eeecfb9eb39a6a5f7b394163f15d261d55a80.zip |
nss: depend on zlib
Required on WNT since 1c748fefc3c5b42e3548a1a7f5017a579982005a, may
be needed on other platforms if using --without-system-zlib.
Change-Id: Ib8e544d81881f425d257514fc475e272ca2e53ed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132648
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Tested-by: Jenkins
(cherry picked from commit b11a5d3900e3c19e94833c1b1e5218288320c3e3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132609
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 37340124d29f77683fdbe6a3e10c4d80f5d4a499)
(cherry picked from commit 4d352e89f4bee6d96f6c07362eea3b9268730f7a)
-rw-r--r-- | external/nss/ExternalProject_nss.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index a404284ac837..77186d320402 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -15,6 +15,10 @@ $(eval $(call gb_ExternalProject_register_targets,nss,\ build \ )) +$(eval $(call gb_ExternalProject_use_externals,nss,\ + zlib \ +)) + ifeq ($(OS),WNT) $(call gb_ExternalProject_get_state_target,nss,build): \ $(call gb_ExternalExecutable_get_dependencies,python) \ |