[Libreoffice-commits] .: 2 commits - configure.in README.cross

[Tor Lillqvist]

 README.cross |   23 ++++++++++++++---------
 configure.in |    2 +-
 2 files changed, 15 insertions(+), 10 deletions(-)

New commits:
commit 768567e9591cda9bd1345efb1a7eb414c386b8aa
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Nov 11 08:59:11 2011 +0200

    No accessible system libxslt for iOS

diff --git a/configure.in b/configure.in
index a6192a8..421289b 100644
--- a/configure.in
+++ b/configure.in
@@ -1031,7 +1031,7 @@ AC_ARG_WITH(system-libwpg,
 AC_ARG_WITH(system-libxml,
     AS_HELP_STRING([--with-system-libxml],
         [Use libxml/libxslt already on system.]),,
- [if test "$_os" = "Darwin" -o $_os = "iOS"; then
+ [if test "$_os" = "Darwin"; then
     with_system_libxml=yes
   else
     with_system_libxml="$with_system_libs"
commit c71d50459e8f761843171eae8961f66a563c6465
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Nov 11 07:52:01 2011 +0200

    Update iOS examples

diff --git a/README.cross b/README.cross
index 9af4de7..6878cf9 100644
--- a/README.cross
+++ b/README.cross
@@ -278,26 +278,31 @@ The Apple tool-chain for iOS cross-building is available only for
 Mac OS X, so that is where I have been doing it.
 
 Here is my autogen.lastrun for iOS (device):
-CXX=ccache /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++-4.2 -arch armv7 -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk
-CC=ccache /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/gcc-4.2 -arch armv7 -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk
-CC_FOR_BUILD=ccache /Xcode3/usr/bin/gcc-4.0
-CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0
+CXX=ccache /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++ -arch armv7 -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk
+CC=ccache /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/gcc -arch armv7 -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk
+CC_FOR_BUILD=ccache /Xcode3/usr/bin/gcc-4.0 -mmacosx-version-min=10.4
+CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0 -mmacosx-version-min=10.4
 --with-distro=LibreOfficeiOS
 --with-external-tar=/Volumes/ooo/git/master/src
 --with-num-cpus=1
 --with-max-jobs=1
+--without-help
+--without-helppack-integration
+--without-myspell-dicts
 
 And here for the iOS simulator:
-CXX=ccache /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/g++-4.2 -arch i386 -isysroot /Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator4.3.sdk
-CC=ccache /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/gcc-4.2 -arch i386 -isysroot /Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator4.3.sdk
-CC_FOR_BUILD=ccache /Xcode3/usr/bin/gcc-4.0
-CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0
+CXX=ccache /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/g++ -arch i386 -isysroot /Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator4.3.sdk
+CC=ccache /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/gcc -arch i386 -isysroot /Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator4.3.sdk
+CC_FOR_BUILD=ccache /Xcode3/usr/bin/gcc-4.0 -mmacosx-version-min=10.4
+CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0 -mmacosx-version-min=10.4
 --with-distro=LibreOfficeiOS
 --with-external-tar=/Volumes/ooo/git/master/src
 --with-num-cpus=1
 --with-max-jobs=1
---disable-librsvg
 --enable-debug
+--without-help
+--without-helppack-integration
+--without-myspell-dicts
 
 
 Android