[Libreoffice-commits] .: liborcus/liborcus_0.1.0-configure.patch liborcus/makefile.mk

[Libreoffice Gerrit user]

 liborcus/liborcus_0.1.0-configure.patch |   20 ++++++++++++++++++++
 liborcus/makefile.mk                    |   11 +++++++++++
 2 files changed, 31 insertions(+)

New commits:
commit 48d544a96d006c1eb511751580e90749319e57db
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun Sep 9 09:55:56 2012 +0300

    Fix cross-compilation of liborcus
    
    Change-Id: I429028fa05b52b5852dae38c50e315d202c8ad3d

diff --git a/liborcus/liborcus_0.1.0-configure.patch b/liborcus/liborcus_0.1.0-configure.patch
new file mode 100644
index 0000000..27050ee
--- /dev/null
+++ b/liborcus/liborcus_0.1.0-configure.patch
@@ -0,0 +1,20 @@
+--- misc/liborcus_0.1.0/config.sub
++++ misc/build/liborcus_0.1.0/config.sub
+@@ -120,7 +120,7 @@
+ # Here we must recognize all the valid KERNEL-OS combinations.
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
++  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+   kopensolaris*-gnu* | \
+   storm-chaos* | os2-emx* | rtmk-nova*)
+@@ -1275,7 +1275,7 @@
+ 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ 	      | -chorusos* | -chorusrdb* | -cegcc* \
+ 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
++	      | -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \
+ 	      | -uxpv* | -beos* | -mpeix* | -udk* \
+ 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
diff --git a/liborcus/makefile.mk b/liborcus/makefile.mk
index fd04605..9e744c2 100644
--- a/liborcus/makefile.mk
+++ b/liborcus/makefile.mk
@@ -38,6 +38,9 @@ TARFILE_MD5=46d9f4cf8b145c21ce1056e116d2ce71
 PATCH_FILES=liborcus_0.1.0-warnings.patch
     # -Werror,-Wunused-variable -Werror,-Wunused-private-field
 
+PATCH_FILES+=liborcus_0.1.0-configure.patch
+    # make config.sub recognize arm-linux-androideabi
+
 .IF "$(GUI)$(COM)"=="WNTMSC"
 
 BUILD_DIR=vsprojects/liborcus-static-nozip
@@ -61,6 +64,14 @@ CONFIGURE_ACTION=./configure \
 	--disable-debug \
 	--disable-spreadsheet-model $(MY_CXXFLAGS)
 
+.IF "$(CROSS_COMPILING)" == "YES"
+CONFIGURE_ACTION+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
+.ENDIF
+
+.IF "$(OS)" == "ANDROID"
+CONFIGURE_ACTION:=LIBS=-lgnustl_shared $(CONFIGURE_ACTION)
+.ENDIF
+
 BUILD_ACTION=make
 BUILD_DIR=