diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2020-03-25 18:59:51 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-03-25 20:32:15 +0100 |
| commit | 10f52ab4d27263439d59f55f40e88ad2fde0cf71 (patch) | |
| tree | 399d8c3d09c056f0cff937238a7616a7c66aac78 /external | |
| parent | 200fbb32c9d620e52c30f0016f11d595c1614185 (diff) | |
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 <vmiklos@collabora.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/nss/UnpackedTarball_nss.mk | 1 | ||||
| -rw-r--r-- | external/nss/nss-online.patch.0 | 11 |
2 files changed, 12 insertions, 0 deletions
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) diff --git a/external/nss/nss-online.patch.0 b/external/nss/nss-online.patch.0 new file mode 100644 index 000000000000..b84a15cc393a --- /dev/null +++ b/external/nss/nss-online.patch.0 @@ -0,0 +1,11 @@ +--- nss/lib/softoken/softoken.h.orig 2020-03-25 18:51:38.786887278 +0100 ++++ nss/lib/softoken/softoken.h 2020-03-25 18:51:47.450997085 +0100 +@@ -145,7 +145,7 @@ + /* + ** macros to check for forked child process after C_Initialize + */ +-#if defined(XP_UNIX) && !defined(NO_FORK_CHECK) ++#if 0 + + #ifdef DEBUG + |