[Libreoffice-commits] .: 3 commits - configure.in post_download.in README.cross

[Tor Lillqvist]

 README.cross     |   18 ++++++++++--------
 configure.in     |    4 ++--
 post_download.in |   36 ++----------------------------------
 3 files changed, 14 insertions(+), 44 deletions(-)

New commits:
commit a45732406540e0a3196506e184c00f664084588f
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Sep 26 15:09:10 2011 +0300

    Match the Android host_os that the new config.sub produces

diff --git a/configure.in b/configure.in
index fbc16cc..f1a38b7 100644
--- a/configure.in
+++ b/configure.in
@@ -1709,7 +1709,7 @@ dragonfly*)
     _os=DragonFly
     ;;
 
-androideabi*)
+linux-androideabi*)
     build_gstreamer=no
     test_cups=no
     test_fontconfig=no
@@ -1723,7 +1723,7 @@ androideabi*)
     ;;
 
 *)
-    AC_MSG_ERROR([$host_os operating system is not suitable to build LibreOffice!])
+    AC_MSG_ERROR([$host_os operating system is not suitable to build LibreOffice for!])
     ;;
 esac
 
commit dee0123807b52a0d1438ee3362f6686ec83067f0
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Sep 26 15:08:03 2011 +0300

    Update the sample autogen.lastrun for Android

diff --git a/README.cross b/README.cross
index 87044e4..5325a4f 100644
--- a/README.cross
+++ b/README.cross
@@ -274,14 +274,14 @@ available for Linux, MacOSX and Windows. (Trying to cross-compile from
 Windows will probably drive you insane.)
 
 Here is my autogen.lastrun for Android:
-SYSBASE=/home/tml/android-ndk-r5c/platforms/android-9/arch-arm
-CC=ccache /home/tml/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot /home/tml/android-ndk-r5c/platforms/android-9/arch-arm
-CXX=ccache /home/tml/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-g++ --sysroot /home/tml/android-ndk-r5c/platforms/android-9/arch-arm -I /home/tml/android-ndk-r5c/sources/cxx-stl/gnu-libstdc++/include -I/home/tml/android-ndk-r5c/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include -L/home/tml/android-ndk-r5c/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a -fexceptions -frtti
-AR=/home/tml/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-ar
-NM=/home/tml/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-nm
-OBJDUMP=/home/tml/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-objdump
-RANLIB=/home/tml/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-ranlib
-STRIP=/home/tml/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-strip
+SYSBASE=/home/tml/android-ndk-r6/platforms/android-9/arch-arm
+CC=ccache /home/tml/android-ndk-r6/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot /home/tml/android-ndk-r6/platforms/android-9/arch-arm
+CXX=ccache /home/tml/android-ndk-r6/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-g++ --sysroot /home/tml/android-ndk-r6/platforms/android-9/arch-arm -I /home/tml/android-ndk-r6/sources/cxx-stl/gnu-libstdc++/include -I/home/tml/android-ndk-r6/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include -L/home/tml/android-ndk-r6/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a -fexceptions -frtti
+AR=/home/tml/android-ndk-r6/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-ar
+NM=/home/tml/android-ndk-r6/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-nm
+OBJDUMP=/home/tml/android-ndk-r6/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-objdump
+RANLIB=/home/tml/android-ndk-r6/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-ranlib
+STRIP=/home/tml/android-ndk-r6/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-strip
 CC_FOR_BUILD=ccache gcc
 CXX_FOR_BUILD=ccache g++
 --build=x86_64-unknown-linux-gnu
@@ -291,6 +291,8 @@ CXX_FOR_BUILD=ccache g++
 --disable-python
 --with-num-cpus=1
 --with-max-jobs=1
+--without-helppack-integration
+--without-myspell-dicts
 
 
 PowerPC Mac OS X
commit 26d092026457398ee23422c5070edca9057e6a25
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Sep 26 15:05:41 2011 +0300

    Simplify

diff --git a/post_download.in b/post_download.in
index 46d50ce..551f5c1 100644
--- a/post_download.in
+++ b/post_download.in
@@ -7,46 +7,14 @@ echo "*   Running the post download checks."
 echo "*"
 echo "********************************************************************"
 
-dnl ===================================================================
-dnl The following is a list of supported systems.
-dnl ===================================================================
 AC_CANONICAL_HOST
 case "$host_os" in
-    solaris*)
-        _os=SunOS
-        ;;
-    linux-gnu*|k*bsd*-gnu*)
-        _os=Linux
-        ;;
-    gnu)
-        _os=GNU
-        ;;
     cygwin*|mingw32*) # Windows
         _os=WINNT
         ;;
-    darwin*) # Mac OS X or iOS
-        _os=Darwin
-        ;;
-    freebsd*)
-        _os=FreeBSD
-        ;;
-    *netbsd*)
-        _os=NetBSD
-        ;;
-    aix*)
-        _os=AIX
-        ;;
-    openbsd*)
-        _os=OpenBSD
-        ;;
-    dragonfly*)
-        _os=DragonFly
-        ;;
-    androideabi*)
-        _os=Android
-        ;;
    *)
-   AC_MSG_ERROR([$host_os operating system is not suitable for LibreOffice!])
+	# We only do stuff for Windows here anyway
+        _os=whatever
    ;;
 esac