ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

android: Fix nss build on aarch64.

Browse Source 
Change-Id: I51c03e13fba4619a881ade27d149722698859815
Reviewed-on: https://gerrit.libreoffice.org/81888
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
This commit is contained in:
Jan Holesovsky
2019-12-02 13:30:50 +01:00
parent 0464540310
commit a9e04c08b8
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
external/nss/ExternalProject_nss.mk
Vendored
+2 -2
View File
@@ -34,8 +34,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) \
external/nss/nss-android.patch.1
Vendored
+18 -1
View File
@@ -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