[Libreoffice-commits] core.git: 2 commits - bin/lo-all-static-libs ios/experimental

[Tor Lillqvist]

 bin/lo-all-static-libs                                                       |   12 ----------
 ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj |    2 -
 2 files changed, 1 insertion(+), 13 deletions(-)

New commits:
commit 6ac7b46651fbb7aae9a7d8db32a3e1f07087b3ee
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sat Sep 19 20:56:24 2015 +0300

    If we don't want any NSS crack on iOS then don't try to use libs from there
    
    Change-Id: I9265ee3ce46d8d2e5af4759e8d9748bd39a3e665

diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs
index 8cef486..effa190 100755
--- a/bin/lo-all-static-libs
+++ b/bin/lo-all-static-libs
@@ -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 \
commit dea5a217f04159afca33e27b3ac5e6d6c4f550a0
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sat Sep 19 20:36:26 2015 +0300

    We can surely bump IPHONEOS_DEPLOYMENT_TARGET to 8.4
    
    Change-Id: I12d2e44e6e4fe0610e4b64e6c7b047461119cae5

diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
index 55828d5..78b4205 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
@@ -2430,7 +2430,7 @@
 					"$(LO_WORKDIR)/UnoApiHeadersTarget/offapi/comprehensive",
 					"$(LO_WORKDIR)/UnpackedTarball/icu/source/common",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.4;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "$(LINK_LDFLAGS)";
 				SDKROOT = iphoneos;