mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

If we don't want any NSS crack on iOS then don't try to use libs from there

Browse Source 
Change-Id: I9265ee3ce46d8d2e5af4759e8d9748bd39a3e665
This commit is contained in:
Tor Lillqvist
2015-09-19 20:56:24 +03:00
parent dea5a217f0
commit 6ac7b46651
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bin/lo-all-static-libs
View File

@@ -46,17 +46,6 @@ IOS)
oslibs="$WORKDIR/UnpackedTarball/icu/source/stubdata/*.a"
oslibs="$oslibs $WORKDIR/UnpackedTarball/xmlsec/src/.libs/*.a"
oslibs="$oslibs $WORKDIR/UnpackedTarball/xmlsec/src/nss/.libs/*.a"
# The NSS dylibs (which we don't build for iOS) are constructed
# from a bunch of static archives and some freestanding object
# files (that are not present in any of the static archives). We
# need the latter too, so collect them here into an archive of
# their own.
ar cr $WORKDIR/UnpackedTarball/nss/nss/lib/ckfw/builtins/out/libLOtemp.a \
$WORKDIR/UnpackedTarball/nss/nss/lib/ckfw/builtins/out/*.o \
$WORKDIR/UnpackedTarball/nss/nss/lib/freebl/out/Darwin_SINGLE_SHLIB/*.o
nsslibs=`find $WORKDIR/UnpackedTarball/nss -name 'lib*.a'`
;;
*)
oslibs=
@@ -67,7 +56,6 @@ echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \
$foolibs \
$WORKDIR/LinkTarget/StaticLibrary/lib*.a \
$oslibs \
$nsslibs \
$WORKDIR/UnpackedTarball/coinmp/Cbc/src/.libs/*.a \
$WORKDIR/UnpackedTarball/coinmp/Cgl/src/.libs/*.a \
$WORKDIR/UnpackedTarball/coinmp/Clp/src/.libs/*.a \