bin/lo-all-static-libs | 41
configure.ac |6
external/Module_external.mk |2
external/curl/UnpackedTarball_curl.mk|1
external/curl/curl-ios.patch.1 | 17 +
external/nss/ExternalProject_nss.mk | 12 -
external/nss/nss-ios.patch | 214 +--
svl/Library_svl.mk |4
xmlsecurity/source/xmlsec/nss/nssinitializer.cxx |8
9 files changed, 278 insertions(+), 27 deletions(-)
New commits:
commit ef56e2e2b4cf45e093a848b352a5edbf87efe8ab
Author: Tor Lillqvist
AuthorDate: Fri Sep 18 12:23:44 2020 +0300
Commit: Tor Lillqvist
CommitDate: Tue Sep 22 22:01:31 2020 +0200
tdf#128136: Build curl, nss, and xmlsec for iOS, too
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/+/103152
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tor Lillqvist
diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs
index 0fcea02eb53e..d89dd8eca296 100755
--- a/bin/lo-all-static-libs
+++ b/bin/lo-all-static-libs
@@ -59,6 +59,47 @@ ANDROID)
iOS)
oslibs="$WORKDIR/UnpackedTarball/icu/source/stubdata/*.a"
oslibs="$oslibs $WORKDIR/UnpackedTarball/cppunit/src/cppunit/.libs/*.a"
+
+ oslibs="$oslibs $WORKDIR/UnpackedTarball/nss/nspr/out/lib/ds/*.a"
+ oslibs="$oslibs $WORKDIR/UnpackedTarball/nss/nspr/out/lib/libc/src/*.a"
+ oslibs="$oslibs $WORKDIR/UnpackedTarball/nss/nspr/out/pr/src/*.a"
+ oslibs="$oslibs $WORKDIR/UnpackedTarball/nss/nss/lib/base/out/*.a"
+ oslibs="$oslibs $WORKDIR/UnpackedTarball/nss/nss/lib/certdb/out/*.a"
+ oslibs="$oslibs $WORKDIR/UnpackedTarball/nss/nss/lib/certhigh/out/*.a"
+
+ # Yes, individual object files here, these are not in any .a
+ oslibs="$oslibs
$WORKDIR/UnpackedTarball/nss/nss/lib/ckfw/builtins/out/*.o"
+
+ oslibs="$oslibs $WORKDIR/UnpackedTarball/nss/nss/lib/ckfw/out/*.a"
+ oslibs="$oslibs $WORKDIR/UnpackedTarball/nss/nss/lib/cryptohi/out/*.a"
+ oslibs="$oslibs $WORKDIR/UnpackedTarball/nss/nss/lib/dev/out/*.a"
+ oslibs="$oslibs $WORKDIR/UnpackedTarball/nss/nss/lib/freebl/out/*.a"
+ oslibs="$oslibs
$WORKDIR/UnpackedTarball/nss/nss/lib/freebl/out/Darwin_SINGLE_SHLIB/*.o"
+ oslibs="$oslibs
$WORKDIR/UnpackedTarball/nss/nss/lib/freebl/out/Darwin_SINGLE_SHLIB/deprecated/*.o"
+ oslibs="$oslibs
$WORKDIR/UnpackedTarball/nss/nss/lib/libpkix/pkix/certsel/out/*.a"
+ oslibs="$oslibs
$WORKDIR/UnpackedTarball/nss/nss/lib/libpkix/pkix/checker/out/*.a"
+ oslibs="$oslibs
$WORKDIR/UnpackedTarball/nss/nss/lib/libpkix/pkix/crlsel/out/*.a"
+ oslibs="$oslibs
$WORKDIR/UnpackedTarball/nss/nss/lib/libpkix/pkix/params/out/*.a"
+ oslibs="$oslibs
$WORKDIR/UnpackedTarball/nss/nss/lib/libpkix/pkix/results/out/*.a"
+ oslibs="$oslibs
$WORKDIR/UnpackedTarball/nss/nss/lib/libpkix/pkix/store/out/*.a"
+ oslibs="$oslibs
$WORKDIR/UnpackedTarball/nss/nss/lib/libpkix/pkix/top/out/*.a"
+ oslibs="$oslibs
$WORKDIR/UnpackedTarball/nss/nss/lib/libpkix/pkix/util/out/*.a"
+ oslibs="$oslibs
$WORKDIR/UnpackedTarball/nss/nss/lib/libpkix/pkix_pl_nss/module/out/*.a"
+ oslibs="$oslibs
$WORKDIR/UnpackedTarball/nss/nss/lib/libpkix/pkix_pl_nss/pki/out/*.a"
+ oslibs="$oslibs
$WORKDIR/UnpackedTarball/nss/nss/lib/libpkix/pkix_pl_nss/system/out/*.a"
+ oslibs="$oslibs $WORKDIR/UnpackedTarball/nss/nss/lib/nss/out/*.a"
+ oslibs="$oslibs $WORKDIR/UnpackedTarball/nss/nss/lib/pk11wrap/out/*.a"
+ oslibs="$oslibs $WORKDIR/UnpackedTarball/nss/nss/lib/pkcs12/out/*.a"
+ oslibs="$oslibs $WORKDIR/UnpackedTarball/nss/nss/lib/pkcs7/out/*.a"
+ oslibs="$oslibs $WORKDIR/UnpackedTarball/nss/nss/lib/pki/out/*.a"
+ oslibs="$oslibs $WORKDIR/UnpackedTarball/nss/nss/lib/smime/out/*.a"
+ oslibs="$oslibs $WORKDIR/UnpackedTarball/nss/nss/lib/softoken/out/*.a"
+ oslibs="$oslibs
