summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2020-08-06 22:43:14 +0300
committerCaolán McNamara <caolanm@redhat.com>2020-11-23 16:15:48 +0100
commit25a00081bbdcd03ddaadb77133adc59be430d259 (patch)
treeb849cfc37105d0050578bdea47ba4822b295d962
parentSet CROSS_COMPILE=1 when cross-compiling nss (diff)
downloadcore-25a00081bbdcd03ddaadb77133adc59be430d259.tar.gz
core-25a00081bbdcd03ddaadb77133adc59be430d259.zip
Use USE_DLFCN also on macOS on arm64
Change-Id: I8975ea2d4f33a101b5ac6db247a6dd062bc0c410 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100273 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106376 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--external/nss/nss_macosx.patch14
1 files changed, 14 insertions, 0 deletions
diff --git a/external/nss/nss_macosx.patch b/external/nss/nss_macosx.patch
index 3144fa687761..c45c5107f094 100644
--- a/external/nss/nss_macosx.patch
+++ b/external/nss/nss_macosx.patch
@@ -71,3 +71,17 @@ diff -ru a/nss/Makefile b/nss/Makefile
ifdef USE_DEBUG_RTL
NSPR_CONFIGURE_OPTS += --enable-debug-rtl
endif
+--- a/a/nspr/pr/include/md/_darwin.h
++++ b/b/nspr/pr/include/md/_darwin.h
+@@ -40,11 +40,7 @@
+
+ #undef HAVE_STACK_GROWING_UP
+ #define HAVE_DLL
+-#if defined(__x86_64__) || TARGET_OS_IPHONE
+ #define USE_DLFCN
+-#else
+-#define USE_MACH_DYLD
+-#endif
+ #define _PR_HAVE_SOCKADDR_LEN
+ #define _PR_STAT_HAS_ST_ATIMESPEC
+ #define _PR_HAVE_LARGE_OFF_T