diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2022-04-06 21:39:45 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2022-04-08 10:54:00 +0200 |
| commit | 37340124d29f77683fdbe6a3e10c4d80f5d4a499 (patch) | |
| tree | 776eb385d4c13dc5d428dfbdbc335fede49a1c9c | |
| parent | Resolves: tdf#146174 allow shortcut key event handling before menubar (diff) | |
| download | core-37340124d29f77683fdbe6a3e10c4d80f5d4a499.tar.gz core-37340124d29f77683fdbe6a3e10c4d80f5d4a499.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>
| -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 5514f2dbb293..02e42b9e666d 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) \ |