[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - external/nss

[Michael Stahl (via logerrit)]

 external/nss/UnpackedTarball_nss.mk |    1 +
 external/nss/nss-bz1646594.patch.1  |   15 +++++++++++++++
 2 files changed, 16 insertions(+)

New commits:
commit 01243e85c0796e8049db3b4365b53c7306886851
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Tue Aug 18 14:36:33 2020 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Tue Aug 18 19:40:38 2020 +0200

    nss: fix Android build
    
    Change-Id: I8d6704a00ee70c1cb397f8f12dac8050f24f44be
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100917
    Tested-by: Michael Stahl <michael.stahl at cib.de>
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    (cherry picked from commit c7d1bb119d88faaafb53d65ad8907ede97d89c8c)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100931
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

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-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.