[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - external/nss

[Tor Lillqvist (via logerrit)]

 external/nss/nss_macosx.patch |   21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

New commits:
commit 61f3e0a213a7cddf929643cfff8daea9d4c857e6
Author:     Tor Lillqvist <tml at iki.fi>
AuthorDate: Sun Dec 6 18:43:10 2020 +0200
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Dec 7 21:47:43 2020 +0100

    More NSS fixes for macOS on arm64
    
    I think the attempt to set CPU_ARCH in
    external/nss/ExternalProject_nss.mk does not actually work. And
    anyway, it should be arm64 for macOS on arm64, not aarch64.
    
    Now NSS configury correctly finds the APIs present in the system when
    building for macOS on arm64. Previously, it attempted to compile the
    test snippets for PowerPC... which caused for instance dladdr() not to
    be found, which caused the softokn3 loading to fail.
    
    (It's somewhat surprising that the NSS configury still has "support"
    for MacOS on PowerPC... Do people really build latest and greatest NSS
    on such machines? Or is it just a leftover and the NSS people never,
    ever, remove anything?)
    
    Change-Id: I0dc35df0460db7997efcfdf92594fd8ae352aa49
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107316
    Tested-by: Jenkins
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107328
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/external/nss/nss_macosx.patch b/external/nss/nss_macosx.patch
index c45c5107f094..07b60a5ed00d 100644
--- a/external/nss/nss_macosx.patch
+++ b/external/nss/nss_macosx.patch
@@ -1,7 +1,17 @@
 diff -ru a/nspr/configure b/nspr/configure
 --- a/a/nspr/configure	2014-09-29 16:50:33.907375937 +0100
 +++ b/b/nspr/configure	2014-09-29 16:51:59.213931947 +0100
-@@ -6577,7 +6579,7 @@
+@@ -6453,6 +6453,9 @@
+     AS='$(CC) -x assembler-with-cpp'
+     CFLAGS="$CFLAGS -Wall -fno-common"
+     case "${target_cpu}" in
++        aarch64)
++            CPU_ARCH=arm64
++            ;;
+         arm*)
+             CPU_ARCH=arm
+             ;;
+@@ -6578,7 +6579,7 @@
  
  
      DSO_CFLAGS=-fPIC
@@ -31,7 +41,14 @@ diff -ru a/nss/coreconf/Darwin.mk b/nss/coreconf/Darwin.mk
  override CPU_ARCH	= x86
  endif
  else
-@@ -40,12 +48,16 @@
+@@ -40,19 +48,20 @@
+ ifeq (arm,$(CPU_ARCH))
+ # Nothing set for arm currently.
+ else
+-OS_REL_CFLAGS	= -Dppc
+-CC              += -arch ppc
+-CCC             += -arch ppc
+ endif
  endif
  
  ifneq (,$(MACOS_SDK_DIR))