diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2020-08-18 14:36:33 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2020-08-18 19:40:29 +0200 |
| commit | 4a63149950f8a69245a61195ba7006a4921776b9 (patch) | |
| tree | 9bfa1f3f1bb11bd582d764c0243fb103eace018a /external | |
| parent | a54fae002b3be54877b25aefe9f8bbecfd68b088 (diff) | |
nss: fix Android build
Change-Id: I8d6704a00ee70c1cb397f8f12dac8050f24f44be
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)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100930
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'external')
| -rw-r--r-- | external/nss/UnpackedTarball_nss.mk | 1 | ||||
| -rw-r--r-- | external/nss/nss-bz1646594.patch.1 | 15 |
2 files changed, 16 insertions, 0 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-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. |