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

2012-08-09 Thread Tor Lillqvist
 README.cross |4 
 configure.in |   16 
 2 files changed, 8 insertions(+), 12 deletions(-)

New commits:
commit 3dd05633bf29dcad613d6787c2a57ea2db2216f7
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Aug 9 23:57:15 2012 +0300

Can use simpler autogen.lastrun now

Change-Id: I66101c025469e9df72c331b981e48893f6a5ac3d

diff --git a/README.cross b/README.cross
index 891b6a5..6b24da2 100644
--- a/README.cross
+++ b/README.cross
@@ -342,16 +342,12 @@ will probably drive you insane.
 Here is an autogen.lastrun for Android, when cross-compiling from Mac
 OS X 10.8 with Xcode 4.4.1:
 
-CC_FOR_BUILD=xcrun clang -arch i386
-CXX_FOR_BUILD=xcrun clang++ -arch i386
---build=x86_64-apple-darwin11
 --disable-zenity
 --enable-debug
 --enable-werror
 --with-android-ndk=/Users/tml/android-ndk-r8b
 --with-android-ndk-toolchain-version=4.6
 --with-android-sdk=/Users/tml/android-sdk-macosx
---with-build-platform-configure-options=--with-macosx-sdk=10.8 
--with-macosx-version-min-required=10.8 --with-macosx-version-max-allowed=10.8
 --with-distro=LibreOfficeAndroid
 --without-doxygen
 --without-helppack-integration
commit 13df2ce5c4ebeb270146678956b97a5a95053a55
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Aug 9 23:42:17 2012 +0300

Don't check $cross_compiling until it has been detected more reliably

Change-Id: I00b2a29d30bee2e71b0a04790b6de48bbbacae8a

diff --git a/configure.in b/configure.in
index 0f56209..0436625 100644
--- a/configure.in
+++ b/configure.in
@@ -66,14 +66,6 @@ dnl do this before argument processing to allow for platform 
dependent defaults
 dnl ===
 AC_CANONICAL_HOST
 
-if test $cross_compiling = yes; then
-CROSS_COMPILING=YES
-else
-CROSS_COMPILING=
-BUILD_TYPE=$BUILD_TYPE NATIVE
-fi
-AC_SUBST(CROSS_COMPILING)
-
 AC_PROG_EGREP
 # AC_PROG_EGREP doesn't set GREP on all systems as well
 AC_PATH_PROG(GREP, grep)
@@ -2761,6 +2753,14 @@ AC_SUBST(ENABLE_DIRECTX)
 AC_SUBST(DISABLE_ACTIVEX)
 AC_SUBST(DISABLE_ATL)
 
+if test $cross_compiling = yes; then
+CROSS_COMPILING=YES
+else
+CROSS_COMPILING=
+BUILD_TYPE=$BUILD_TYPE NATIVE
+fi
+AC_SUBST(CROSS_COMPILING)
+
 dnl ===
 dnl  Test the gcc version
 dnl ===
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2012-05-20 Thread Tor Lillqvist
 Advance notice would be appreciated so that I can find a way to adapt
 tinderbuild2

Sure. That's why I didn't want to remove the (as such superseded)
--with-*-for-build options, but just give a gentle hint.

Anyway, the change I did was enough to improve the itch I had to
scratch at the time, I don't have any immediate plans to implement a
separate configure.lastrun.{host,build}, and/or drop the backup copy
aspect of autogen.lastrun.

--tml
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


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

2012-05-19 Thread Norbert Thiebaud
On Fri, May 18, 2012 at 4:39 AM, David Tardon dtar...@redhat.com wrote:
 On Fri, May 18, 2012 at 11:59:40AM +0300, Tor Lillqvist wrote:
  Why not? Changing the inner configure call to
 
  ./configure `cat configure.lastrun.build`

 Sure, but then there would be a discrepancy with how autogen.lastrun
 works. Or should we realize already that autogen.lastrun isn't
 actually valued by developers as a backup copy of their last
 autogen.sh parameters, but it is seen as a precious input file, edited
 and certainly not intended to get over-written... and remove the code
 to (re)write it from autogen.sh?

 TBH, I already forgot it _is_ overwritten :-/ I cannot even remember the
 last time I run autogen.sh with options... So I am all for treating it
 as input file unchangeable by autogen.sh.

 Anyway, I am not opposed to this
 idea. I would perhaps call it configure.args.build (and
 configure.args.host, if we remove the backup copy aspect)?

 I like that.

Advance notice would be appreciated so that I can find a way to adapt
tinderbuild2

Right know I use autogen.lastrun to set each profile autogen.sh
variable by copying a reference file into autogen.lastrun,
before running autogen.sh

iow: I need a way to detect, before autogen.sh, that autogen.lastrun
is not used anymore and add the code to deal with whatever the
replacement is, in tinbuild2, before the change is committed,
otherwise that will break most tinderboxes...

Norbert
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


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

2012-05-18 Thread David Tardon
On Thu, May 17, 2012 at 11:41:52PM -0700, Tor Lillqvist wrote:
 commit 6868d84b13a52efe91337f2dccb88e59b9f8d2b7
 Author: Tor Lillqvist t...@iki.fi
 Date:   Thu May 17 22:45:04 2012 +0300
 
 Add generic --with-build-platform-configure-options
 
 diff --git a/configure.in b/configure.in
 index 9c23d8a..510d82a 100644
 --- a/configure.in
 +++ b/configure.in
 @@ -991,6 +991,9 @@ AC_ARG_WITH(gnu-patch,
  [Specify location of GNU patch on Solaris or FreeBSD.]),
  ,)
  
 +AC_ARG_WITH(build-platform-configure-options,
 +[Specify options for the configure script run for the *build* 
 platform in a cross-compilation])
 +
  AC_ARG_WITH(gnu-cp,
  AS_HELP_STRING([--with-gnu-cp],
  [Specify location of GNU cp on Solaris or FreeBSD.]),
 @@ -2021,6 +2024,7 @@ AC_ARG_WITH(macosx-version-max-allowed,
  
  dnl ===
  dnl options for stuff used during cross-compilation build
 +dnl These are superseded by --with-build-platform-configure-options
  dnl ===
  
  AC_ARG_WITH(system-boost-for-build,
 @@ -3472,6 +3476,7 @@ if test $cross_compiling = yes; then
  test -n $with_system_expat_for_build  sub_conf_opts=$sub_conf_opts 
 --with-system-expat
  test $with_system_icu_for_build = yes -o 
 $with_system_icu_for_build = force  sub_conf_opts=$sub_conf_opts 
 --with-system-icu
  test -n $with_system_libxml_for_build  sub_conf_opts=$sub_conf_opts 
 --with-system-libxml
 +sub_conf_opts=$sub_conf_opts $with_build_platform_configure_options
  ./configure \
  --disable-mozilla \
  --disable-build-mozilla \

This is a good idea, but I think it would be even better to have
autogen.lastrun.build (or whatever you want to call it). Then we would
not need to specify _any_ build-specific options for the host configure.
Opinions?

D.
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2012-05-18 Thread Tor Lillqvist
 README.cross |   66 +++
 configure.in |5 
 2 files changed, 27 insertions(+), 44 deletions(-)

New commits:
commit bc229ca1abf8b179631ae563ef77f565a1a9d496
Author: Tor Lillqvist t...@iki.fi
Date:   Thu May 17 22:57:46 2012 +0300

Update README.cross to match reality better

Change-Id: I14e97bb9e3351ed7a5e7e8c853253353bfe9df2e

diff --git a/README.cross b/README.cross
index 7dcb03c..c66e1d4 100644
--- a/README.cross
+++ b/README.cross
@@ -1,29 +1,15 @@
 Cross-compiling LibreOffice
 ===
 
-The cross-compilation experimentation is going on for four platforms:
-Windows, iOS, Android and PowerPC Mac OS X. It happens in the master
-branch of LibreOffice. Some people have talked about setting up a
-separate branch for Android work, or even separate clones at github,
-but that is not necessary.
-
-Cross-compilation of LibreOffice completely is not possible yet. Much
-work has been done, baby steps for some platforms, much more for
-others, but a lot remains. For iOS and Android this work is highly
-experimental, originally done in spare time just for the hacking
-pleasure. No promise, explicit or implied, is given that it will ever
-be finished.
-
-Searching for information about cross-compilation of OpenOffice.org
-(the predecessor of LibreOffice) you will find information about what
-actually was not cross-compilation, but using QEMU.
+Cross-compilation work has been done, to various degrees, for four
+platforms: Windows, iOS, Android and PowerPC Mac OS X.
 
 
 General
 ---
 
 In GNU Autoconf terminology, build is the platform on which you are
-running a build on some software and host is the platform on which
+running a build of some software and host is the platform on which
 the software you are building will run. Only in the specific case of
 building compilers and other programming tools is the term target
 used to indicate the platform for which the tools your are building
@@ -180,7 +166,8 @@ CXX_FOR_BUILD=ccache g++
 --without-helppack-integration
 --without-myspell-dicts
 
-Once you have compiled it, you may want to try to run it:
+Once you have compiled it, you may want to try to run it, for instance
+using Wine:
 
 $ cd /tmp
 $ tar xf 
your-build-dir/instsetoo_native/wntgcci.pro/LibreOffice_Dev/archive/install/en-US/LibO-Dev_3.6.0alpha0_Win_x86_install-arc_en-US.tar.gz
@@ -277,7 +264,8 @@ thought yet.
 The Apple tool-chain for iOS cross-building is available only for
 Mac OS X.
 
-Here is an autogen.lastrun for iOS (device) using Xcode 4.3 and clang:
+Here is an autogen.lastrun for iOS (device) using Xcode 4.3 and clang,
+and Xcode 3 for the build platform parts:
 CXX=ccache 
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++
 -arch armv7 -isysroot 
/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS5.0.sdk
 CC=ccache 
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang
 -arch armv7 -isysroot 
/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS5.0.sdk
 CC_FOR_BUILD=ccache /Xcode3/usr/bin/gcc-4.0 -mmacosx-version-min=10.4
@@ -288,31 +276,18 @@ CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0 
-mmacosx-version-min=10.4
 --without-helppack-integration
 --without-myspell-dicts
 
-And here for the iOS simulator, using Xcode 4.2 and gcc:
-CXX=ccache 
/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/g++
 -arch i386 -isysroot 
/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator5.0.sdk
-CC=ccache 
/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/gcc
 -arch i386 -isysroot 
/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator5.0.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-system-nss
---enable-debug
---without-help
---without-helppack-integration
---without-myspell-dicts
-
-It seems that with the latest iOS SDK one has to do:
-sudo ln -s i686-apple-darwin10 
/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator4.3.sdk/usr/include/c++/4.2.1/i686-apple-darwin11
-or g++ won't find its headers like bits/c++config.h
-
 The --with-system-nss doesn't mean that any Mozilla NSS would be used,
 it's just a trick to bypass some tests in the configure script.
 
-For the iOS simulator, using Xcode 4.3 and gcc (should switch to clang here, 
too):
-CXX=ccache 
/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/g++
 -arch i386 -isysroot 
/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator5.0.sdk

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

2012-05-18 Thread David Tardon
On Thu, May 17, 2012 at 11:41:52PM -0700, Tor Lillqvist wrote:
 commit 6868d84b13a52efe91337f2dccb88e59b9f8d2b7
 Author: Tor Lillqvist t...@iki.fi
 Date:   Thu May 17 22:45:04 2012 +0300
 
 Add generic --with-build-platform-configure-options
 
 diff --git a/configure.in b/configure.in
 index 9c23d8a..510d82a 100644
 --- a/configure.in
 +++ b/configure.in
 @@ -991,6 +991,9 @@ AC_ARG_WITH(gnu-patch,
  [Specify location of GNU patch on Solaris or FreeBSD.]),
  ,)
  
 +AC_ARG_WITH(build-platform-configure-options,
 +[Specify options for the configure script run for the *build* 
 platform in a cross-compilation])
 +
  AC_ARG_WITH(gnu-cp,
  AS_HELP_STRING([--with-gnu-cp],
  [Specify location of GNU cp on Solaris or FreeBSD.]),
 @@ -2021,6 +2024,7 @@ AC_ARG_WITH(macosx-version-max-allowed,
  
  dnl ===
  dnl options for stuff used during cross-compilation build
 +dnl These are superseded by --with-build-platform-configure-options
  dnl ===
  
  AC_ARG_WITH(system-boost-for-build,
 @@ -3472,6 +3476,7 @@ if test $cross_compiling = yes; then
  test -n $with_system_expat_for_build  sub_conf_opts=$sub_conf_opts 
 --with-system-expat
  test $with_system_icu_for_build = yes -o 
 $with_system_icu_for_build = force  sub_conf_opts=$sub_conf_opts 
 --with-system-icu
  test -n $with_system_libxml_for_build  sub_conf_opts=$sub_conf_opts 
 --with-system-libxml
 +sub_conf_opts=$sub_conf_opts $with_build_platform_configure_options
  ./configure \
  --disable-mozilla \
  --disable-build-mozilla \

This is a good idea, but I think it would be even better to have
autogen.lastrun.build (or whatever you want to call it). Then we would
not need to specify _any_ build-specific options for the host configure.
Opinions?

D.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


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

2012-05-18 Thread Tor Lillqvist
 This is a good idea, but I think it would be even better to have
 autogen.lastrun.build (or whatever you want to call it). Then we would
 not need to specify _any_ build-specific options for the host configure.
 Opinions?

I don't think that would be easy to implement, and in any case, then
we should rename autogen.lastrun to configure.lastun (possibly then
suffixed with .host and .build) to avoid confusion. After all,
autogen.sh is not run twice in a cross-compiling configuration;
configure is.

--tml
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


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

2012-05-18 Thread David Tardon
On Fri, May 18, 2012 at 11:40:13AM +0300, Tor Lillqvist wrote:
  This is a good idea, but I think it would be even better to have
  autogen.lastrun.build (or whatever you want to call it). Then we would
  not need to specify _any_ build-specific options for the host configure.
  Opinions?
 
 I don't think that would be easy to implement,

Why not? Changing the inner configure call to

./configure `cat configure.lastrun.build`

seems pretty simple (of course there should be check if the file exists
etc.) Or am I missing something?

 and in any case, then
 we should rename autogen.lastrun to configure.lastun (possibly then
 suffixed with .host and .build) to avoid confusion. After all,
 autogen.sh is not run twice in a cross-compiling configuration;
 configure is.

Yes, that would make sense. I just used the terminology we have now (and
I added or whatever you want to call it).

D.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


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

2012-05-18 Thread Tor Lillqvist
 Why not? Changing the inner configure call to

 ./configure `cat configure.lastrun.build`

Sure, but then there would be a discrepancy with how autogen.lastrun
works. Or should we realize already that autogen.lastrun isn't
actually valued by developers as a backup copy of their last
autogen.sh parameters, but it is seen as a precious input file, edited
and certainly not intended to get over-written... and remove the code
to (re)write it from autogen.sh? Anyway, I am not opposed to this
idea. I would perhaps call it configure.args.build (and
configure.args.host, if we remove the backup copy aspect)?

--tml
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


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

2012-05-18 Thread David Tardon
On Fri, May 18, 2012 at 11:59:40AM +0300, Tor Lillqvist wrote:
  Why not? Changing the inner configure call to
 
  ./configure `cat configure.lastrun.build`
 
 Sure, but then there would be a discrepancy with how autogen.lastrun
 works. Or should we realize already that autogen.lastrun isn't
 actually valued by developers as a backup copy of their last
 autogen.sh parameters, but it is seen as a precious input file, edited
 and certainly not intended to get over-written... and remove the code
 to (re)write it from autogen.sh?

TBH, I already forgot it _is_ overwritten :-/ I cannot even remember the
last time I run autogen.sh with options... So I am all for treating it
as input file unchangeable by autogen.sh.

 Anyway, I am not opposed to this
 idea. I would perhaps call it configure.args.build (and
 configure.args.host, if we remove the backup copy aspect)?

I like that.

D.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


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

2012-01-22 Thread Tor Lillqvist
 README.cross |   68 ---
 configure.in |2 -
 2 files changed, 29 insertions(+), 41 deletions(-)

New commits:
commit c4feba9af53831a7bb1ff4765b4294ce0b6ea613
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Sun Jan 22 10:18:47 2012 +0200

Wash my hands

diff --git a/README.cross b/README.cross
index 67fb1d4..f3c62b2 100644
--- a/README.cross
+++ b/README.cross
@@ -1,20 +1,16 @@
 Cross-compiling LibreOffice
 ===
 
-Notes on cross-compiling LibreOffice, originally written by Tor
-Lillqvist tlillqv...@suse.com t...@iki.fi in May, 2011, for later
-history see git log.
-
-My cross-compilation experimentation is going on for four platforms:
-Windows, iOS, Android and PowerPC Mac OS X. I work on the master
-branch of LibreOffice. Some other people have talked about setting up
-a separate branch for Android work, or even separate clones at
-github. I am not interested in that.
+The cross-compilation experimentation is going on for four platforms:
+Windows, iOS, Android and PowerPC Mac OS X. It happens in the master
+branch of LibreOffice. Some people have talked about setting up a
+separate branch for Android work, or even separate clones at github,
+but that is not necessary.
 
 Cross-compilation of LibreOffice completely is not possible yet. Much
 work has been done, baby steps for some platforms, much more for
 others, but a lot remains. For iOS and Android this work is highly
-experimental, originally done in my spare time just for the hacking
+experimental, originally done in spare time just for the hacking
 pleasure. No promise, explicit or implied, is given that it will ever
 be finished.
 
@@ -64,27 +60,27 @@ Windows
 ---
 
 There is some support in LibreOffice already (from OpenOffice.org) for
-building it locally on Windows with the GNU tool-chain (MinGW). But as
-far as I know, that work has never attempted cross-compilation.
+building it locally on Windows with the GNU tool-chain
+(MinGW). Apparently, that work has never attempted cross-compilation.
 
 This OOo-originated MinGW support attempts to support both running
 Cygwin gcc in its -mno-cygwin mode, and a native MinGW compiler. The
 -mno-cygwin mechanism in the Cygwin gcc is rapidly being obsoleted, if
-it isn't already, and I have not attempted to try to keep it working;
-in fact I have activly cleaned out mechanisms related to this. Ditto
+it isn't already, and we have not attempted to try to keep it working;
+in fact we have activly cleaned out mechanisms related to this. Ditto
 for native MinGW. If one compiles natively on Windows, just use
 Microsoft's compiler. OOo/LO has been built for Windows all the time
 using that.
 
-In my opinion, the only case where it makes sense to use MinGW is for
+The only case where it makes sense to use MinGW is for
 cross-compilation. There is just too much crack on Windows anyway, and
 it is a semi-miracle (well, make that the result of years of work)
 that the MSVC build under Cygwin works as nicely as it does.
 
 MinGW is available as cross-build toolchains pre-packaged in more or
-less official packages for many Linux distros including Debian, Fedora,
-openSUSE and SLE. Personally I use the mingw32 packages in the Open
-Build Service, running on openSUSE:
+less official packages for many Linux distros including Debian,
+Fedora, openSUSE and SLE. For instance the mingw32 packages in the
+Open Build Service, running on openSUSE:
 
 http://download.opensuse.org/repositories/windows:/mingw:/win32/
 
@@ -119,8 +115,8 @@ that's likely to be fixed in the openSUSE project.
 
 It is somewhat unclear how well thought-out the conditionals and code
 for MinGW inside the OOo-originated code in LibreOffice actually
-are. What I have noticed of it seems a bit randomish, with
-copy-pasting having been preferred to factoring out differences.
+are. It often seems a bit randomish, with copy-pasting having been
+preferred to factoring out differences.
 
 Most of the configuration settings are maintained in the
 distro-configs/LibreOfficeMinGW.conf file, so in your autogen.lastrun,
@@ -239,7 +235,7 @@ TODO:
   - much of the stuff currently relies on --with-system-*, and
 consequently on the mingw32-* openSUSE packages; might be good to be
 able to build with as few dependencies as possible - but that is low
-prio I think
+prio
 
 - profiling
   - when all the above is sorted out, we should look at the speed of
@@ -273,9 +269,9 @@ how UNO is implemented and used. None of that has been 
spared much
 thought yet.
 
 The Apple tool-chain for iOS cross-building is available only for
-Mac OS X, so that is where I have been doing it.
+Mac OS X.
 
-Here is my autogen.lastrun for iOS (device):
+Here is an autogen.lastrun for iOS (device):
 CXX=ccache /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++ -arch 
armv7 -isysroot 
/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS5.0.sdk
 CC=ccache 

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

2011-11-10 Thread Tor Lillqvist
 README.cross |   23 ++-
 configure.in |2 +-
 2 files changed, 15 insertions(+), 10 deletions(-)

New commits:
commit 768567e9591cda9bd1345efb1a7eb414c386b8aa
Author: Tor Lillqvist t...@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 t...@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
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits