808e8a8e9e
We must link nss statically, including the three dylibs that normally are loaded at run-time, because including bare dylibs in an iOS appp on the App Store is not OK. See https://developer.apple.com/forums/thread/125796 . For linking the softokn3 library statically, NSS already had code, behind NSS_STATIC_SOFTOKEN ifdefs. Introduce two more macros: NSS_STATIC_FREEBL for the freebl library and NSS_STATIC_PKCS11 for the nssckbi library. Turn off parallelism for the sub-make building nss. There seems to be race conditions or something when running simultaneous instances of the nsinstall.py script or the nsinstall program in nss (used when building nss for the build platform). When cross-compiling from macOS, use python3 to run the nsinstall.py script, as it is Python 3. Change-Id: Idd427b5ebf21f802b3feb0d5a3d259317ba8fc67 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103106 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103218 Tested-by: Jenkins
17 lines
644 B
Diff
17 lines
644 B
Diff
# -*- Mode: Diff -*-
|
|
#
|
|
# We don't want curl's configure script to add a -mmacosx-version-min
|
|
# option when it is for iOS we are building. In that case already $CC
|
|
# contains a -miphoneos-version-min option.
|
|
|
|
--- curl/configure
|
|
+++ curl/configure
|
|
@@ -18976,7 +18976,7 @@
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for *version-min in CFLAGS" >&5
|
|
$as_echo_n "checking for *version-min in CFLAGS... " >&6; }
|
|
min=""
|
|
- if test -z "$(echo $CFLAGS | grep m.*os.*-version-min)"; then
|
|
+ if test -z "$(echo $CC $CFLAGS | grep m.*os.*-version-min)"; then
|
|
min="-mmacosx-version-min=10.8"
|
|
CFLAGS="$CFLAGS $min"
|
|
fi
|