diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2019-11-01 10:57:21 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2020-05-18 17:43:03 +0200 |
| commit | e97f190b700c7438b1f70eab1efa0ae24fa117de (patch) | |
| tree | 7fc0e7f584258785c48875e111a97335c6e31ea0 /external | |
| parent | nss: fix Android build (diff) | |
| download | core-e97f190b700c7438b1f70eab1efa0ae24fa117de.tar.gz core-e97f190b700c7438b1f70eab1efa0ae24fa117de.zip | |
android: Fix nss build on aarch64.
Change-Id: I51c03e13fba4619a881ade27d149722698859815
Reviewed-on: https://gerrit.libreoffice.org/81888
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/nss/ExternalProject_nss.mk | 4 | ||||
| -rw-r--r-- | external/nss/nss-android.patch.1 | 19 |
2 files changed, 20 insertions, 3 deletions
diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index 3ff9951d6e65..57b0c961c611 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -38,8 +38,8 @@ else # OS!=WNT $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalExecutable_get_dependencies,python) $(call gb_ExternalProject_run,build,\ $(if $(filter ANDROID FREEBSD LINUX MACOSX,$(OS)),$(if $(filter X86_64,$(CPUNAME)),USE_64=1)) \ - $(if $(filter iOS,$(OS)),\ - $(if $(filter arm64,$(CC)),USE_64=1)) \ + $(if $(filter ANDROID,$(OS)),$(if $(filter AARCH64,$(CPUNAME)),USE_64=1)) \ + $(if $(filter iOS,$(OS)),$(if $(filter ARM64,$(CPUNAME)),USE_64=1)) \ $(if $(filter MACOSX,$(OS)),\ $(if $(filter-out POWERPC,$(CPUNAME)),MACOS_SDK_DIR=$(MACOSX_SDK_PATH)) \ NSS_USE_SYSTEM_SQLITE=1) \ diff --git a/external/nss/nss-android.patch.1 b/external/nss/nss-android.patch.1 index 40478d34ddbf..560623080c73 100644 --- a/external/nss/nss-android.patch.1 +++ b/external/nss/nss-android.patch.1 @@ -1,11 +1,12 @@ diff -ur nss.org/nspr/build/autoconf/config.sub nss/nspr/build/autoconf/config.sub --- nss.org/nspr/build/autoconf/config.sub 2017-09-07 15:29:45.031246453 +0200 +++ nss/nspr/build/autoconf/config.sub 2017-09-07 15:32:13.087235423 +0200 -@@ -111,6 +111,10 @@ +@@ -111,6 +111,11 @@ exit 1;; esac +if test $1 = "arm-unknown-linux-androideabi"; then echo $1; exit; fi ++if test $1 = "aarch64-unknown-linux-android"; then echo $1; exit; fi +if test $1 = "i686-pc-linux-android"; then echo $1; exit; fi +if test $1 = "x86_64-pc-linux-android"; then echo $1; exit; fi + @@ -69,3 +70,19 @@ diff -ur nss.org/nss/Makefile nss/nss/Makefile MODULE = nss MAPFILE = $(OBJDIR)/nssckbi.def +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 +@@ -234,7 +234,11 @@ + # + # this should be configurable from the user + # +- OS_TEST := arm ++ ifeq ($(USE_64),1) ++ OS_TEST := aarch64 ++ else ++ OS_TEST := arm ++ endif + OS_ARCH = Android + ifndef OS_TARGET_RELEASE + OS_TARGET_RELEASE := 8 |