diff options
author | Michael Stahl <michael.stahl@allotropia.de> | 2022-04-06 21:39:45 +0200 |
---|---|---|
committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2022-04-08 10:52:29 +0200 |
commit | 2ce52702116b703345f91d7152d134b2e51e77e3 (patch) | |
tree | 49934bb1de136f3cf7126e9c39b455063e58c2a7 | |
parent | Red used instead of Green (diff) | |
download | core-2ce52702116b703345f91d7152d134b2e51e77e3.tar.gz core-2ce52702116b703345f91d7152d134b2e51e77e3.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/+/132608
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
-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 592ea70741b9..cc6c19bdbc35 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) \ |