[Libreoffice-commits] .: libtextcat/libtextcat-2.2.patch libtextcat/makefile.mk

[Tor Lillqvist]

 libtextcat/libtextcat-2.2.patch |    7 ++++---
 libtextcat/makefile.mk          |    6 ++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 4daaf07a6506d3bd0abc9b5b8e513ce6f8288d3a
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu May 19 00:27:36 2011 +0300

    Build libtextcat for Android

diff --git a/libtextcat/libtextcat-2.2.patch b/libtextcat/libtextcat-2.2.patch
index 03385e8..0a2e5d7 100644
--- a/libtextcat/libtextcat-2.2.patch
+++ b/libtextcat/libtextcat-2.2.patch
@@ -1,5 +1,5 @@
---- misc/libtextcat-2.2/configure	Thu May 22 13:39:55 2003
-+++ misc/build/libtextcat-2.2/configure	Mon Mar 31 11:29:14 2008
+--- misc/build/libtextcat-2.2/configure
++++ misc/build/libtextcat-2.2/configure
 @@ -3451,7 +3451,7 @@
    ;;
  
@@ -3897,7 +3897,7 @@
  	-solaris1 | -solaris1.*)
  		os=`echo $os | sed -e 's|solaris1|sunos4|'`
  		;;
-@@ -1100,24 +1286,30 @@
+@@ -1100,24 +1286,31 @@
  	# Each alternative MUST END IN A *, to match a version number.
  	# -sysv* is not here because it comes later, after sysvr4.
  	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
@@ -3920,6 +3920,7 @@
  	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
  	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 -	      | -chorusos* | -chorusrdb* \
++	      | -androideabi* \
 +	      | -chorusos* | -chorusrdb* | -cegcc* \
  	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 -	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk
index a6198c5..e1b480b 100644
--- a/libtextcat/makefile.mk
+++ b/libtextcat/makefile.mk
@@ -73,7 +73,13 @@ CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)"
 
 BUILD_ACTION=make
 
+.IF "$(OS)"=="ANDROID"
+# The libtool in the libtextcat-2.2 tarball doesn't build
+# shared libraries on Android, for some reason.
+OUT2LIB=$(BUILD_DIR)$/src$/.libs$/libtextcat*.a
+.ELSE
 OUT2LIB=$(BUILD_DIR)$/src$/.libs$/libtextcat*$(DLLPOST)
+.ENDIF
 
 .ENDIF # "$(GUI)"=="UNX"