[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - external/nss

[Jan Holesovsky (via logerrit)]

 external/nss/ExternalProject_nss.mk |    4 ++--
 external/nss/nss-android.patch.1    |   19 ++++++++++++++++++-
 2 files changed, 20 insertions(+), 3 deletions(-)

New commits:
commit 0eb512a8db23347733c97f8f2f8914d8a254b2c2
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Fri Nov 1 10:57:21 2019 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Mon Dec 2 09:21:56 2019 +0100

    android: Fix nss build on aarch64.
    
    Change-Id: I51c03e13fba4619a881ade27d149722698859815
    Reviewed-on: https://gerrit.libreoffice.org/81886
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk
index 2e93d7000c3a..4d175e184da5 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -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) \
diff --git a/external/nss/nss-android.patch.1 b/external/nss/nss-android.patch.1
index f8b4cdaf3753..4c03dce226f0 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
 +
@@ -48,3 +49,19 @@ diff -ur nss.org/nss/Makefile nss/nss/Makefile
                         --with-android-version=$(OS_TARGET_RELEASE) \
                         --with-android-toolchain=$(ANDROID_TOOLCHAIN) \
                         --with-android-platform=$(ANDROID_SYSROOT)
+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