Re: [Libreoffice-commits] .: 2 commits - configure.in README.cross
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
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
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
