diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2020-08-18 14:36:33 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-08-18 17:35:56 +0200 |
| commit | 4538706e36f56e607cfd232f81dd2b5e988d279d (patch) | |
| tree | c87fed7f7208ec050e3a88ee766b6c5a56529b77 /external | |
| parent | 9b65a3495875b06e8d830e0cbc5456a539ac2a0c (diff) | |
nss: fix Android build
[ And also fix up external/nss/nss-android.patch.1, which was broken by commit 9770f350d2eb8719a1a8f70f4e5cecb70583e25a. ]
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100917
Tested-by: Michael Stahl <michael.stahl@cib.de>
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
(cherry picked from commit c7d1bb119d88faaafb53d65ad8907ede97d89c8c)
Change-Id: I8d6704a00ee70c1cb397f8f12dac8050f24f44be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100929
Tested-by: Miklos Vajna <vmiklos@collabora.com>
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-android.patch.1 | 10 | ||||
| -rw-r--r-- | external/nss/nss-bz1646594.patch.1 | 15 |
3 files changed, 21 insertions, 5 deletions
diff --git a/external/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk index 1cad5852fa89..8fa1edd530cc 100644 --- a/external/nss/UnpackedTarball_nss.mk +++ b/external/nss/UnpackedTarball_nss.mk @@ -22,6 +22,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\ external/nss/nss.vs2015.patch \ external/nss/nss.vs2015.pdb.patch \ external/nss/nss.bzmozilla1238154.patch \ + external/nss/nss-bz1646594.patch.1 \ external/nss/macos-dlopen.patch.0 \ $(if $(filter iOS,$(OS)), \ external/nss/nss-ios.patch) \ diff --git a/external/nss/nss-android.patch.1 b/external/nss/nss-android.patch.1 index 368b7a23668b..73882e61f3f6 100644 --- a/external/nss/nss-android.patch.1 +++ b/external/nss/nss-android.patch.1 @@ -59,17 +59,17 @@ diff -ur nss.org/nss/Makefile nss/nss/Makefile install_nspr: build_nspr $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) install ---- nss/nss/lib/ckfw/builtins/manifest.mn.orig 2019-11-26 15:18:22.185985193 +0100 -+++ nss/nss/lib/ckfw/builtins/manifest.mn 2019-11-26 15:18:29.281982387 +0100 +--- nss/nss/lib/ckfw/builtins/manifest.mn 2019-11-26 15:18:22.185985193 +0100 ++++ nss/nss/lib/ckfw/builtins/manifest.mn 2020-08-18 18:04:29.151889733 +0300 @@ -5,7 +5,7 @@ CORE_DEPTH = ../../.. --DIRS = testlib +-DIRS = . testlib +DIRS = - MODULE = nss - MAPFILE = $(OBJDIR)/nssckbi.def + testlib: . + diff -ur nss/nss/coreconf/arch.mk nss/nss/coreconf/arch.mk --- nss/nss/coreconf/arch.mk 2019-11-01 10:29:44.933245745 +0100 +++ nss/nss/coreconf/arch.mk 2019-11-01 10:32:04.347181076 +0100 diff --git a/external/nss/nss-bz1646594.patch.1 b/external/nss/nss-bz1646594.patch.1 new file mode 100644 index 000000000000..e6c75922a7dc --- /dev/null +++ b/external/nss/nss-bz1646594.patch.1 @@ -0,0 +1,15 @@ +regression from https://bugzilla.mozilla.org/show_bug.cgi?id=1646594 + +--- nss/nss/coreconf/arch.mk.orig2 2020-08-18 14:33:21.295252404 +0200 ++++ nss/nss/coreconf/arch.mk 2020-08-18 14:33:46.360320806 +0200 +@@ -116,8 +116,10 @@ + OS_RELEASE := $(word 1,$(OS_RELEASE)).$(word 2,$(OS_RELEASE)) + endif + KERNEL = Linux ++ifneq ($(OS_TARGET),Android) + include $(CORE_DEPTH)/coreconf/Linux.mk + endif ++endif + + # Since all uses of OS_ARCH that follow affect only userland, we can + # merge other Glibc systems with Linux here. |