diff options
| author | Tor Lillqvist <tml@iki.fi> | 2011-05-19 00:27:36 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-05-19 00:28:24 +0300 |
| commit | 643a4b1de272daf195aebf6be765093db040cf40 (patch) | |
| tree | 6d2fdf144921a837f6b5de0691b8bae07943b57b | |
| parent | bda0eb161faf6c0600cebce7fce8e9198657e386 (diff) | |
Build libtextcat for Android
| -rw-r--r-- | libtextcat/libtextcat-2.2.patch | 7 | ||||
| -rw-r--r-- | libtextcat/makefile.mk | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/libtextcat/libtextcat-2.2.patch b/libtextcat/libtextcat-2.2.patch index 03385e89ef3b..0a2e5d7ca22a 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 a6198c5cccd9..e1b480bfddba 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" |