external/nss/nss_macosx.patch | 14 ++++++++++++++
1 file changed, 14 insertions(+)
New commits:
commit c0ee423b8580a361086f8018ece611ce0b7fe00b
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Thu Aug 6 22:43:14 2020 +0300
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Sun Nov 15 10:39:47 2020 +0100
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 <t...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105878
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
