From 10f52ab4d27263439d59f55f40e88ad2fde0cf71 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Wed, 25 Mar 2020 18:59:51 +0100 Subject: nss: fix this up to work with Online again Regression from commit 8512f4ca090c85477a6670438aeefe7fdfcf8a98 (build nss using their new build system (gyp/ninja-based), 2020-02-19), the problem was that for some reason nss was pre-loaded in the past in some magic way, but after that commit we need to do this explicitly. Additionally, if the core.git build is a debug one, we now get an nss assert that checks if there was a fork between loading and using nss. I don't think that was enabled before, so just patch that out to fix the build breakage on the online.git side. online.git's unit-password-protected now passes again with this. Change-Id: I56c0019c446b4cabbb73141bbff80e8d8ffdb54c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91068 Tested-by: Jenkins Reviewed-by: Miklos Vajna --- external/nss/UnpackedTarball_nss.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'external/nss/UnpackedTarball_nss.mk') diff --git a/external/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk index 8bfc2557bece..ac1d3c9928e2 100644 --- a/external/nss/UnpackedTarball_nss.mk +++ b/external/nss/UnpackedTarball_nss.mk @@ -36,6 +36,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\ external/nss/macos-dlopen.patch.0 \ external/nss/buildsystem.patch.0 \ external/nss/fix-cc-detect-with-ccache.patch.0 \ + external/nss/nss-online.patch.0 \ )) ifeq ($(OS),WNT) -- cgit