diff options
| author | Thorsten Behrens <tbehrens@novell.com> | 2011-09-26 23:27:57 +0200 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@novell.com> | 2011-09-27 09:46:38 +0200 |
| commit | 04b8b4fbbb4b7f72f33d0b76b86945cb98c4ecd9 (patch) | |
| tree | a9038a8c5081a246779a6d9b7fbfe0e774af725a /libtextcat | |
| parent | 47d7d1e987e1caa030c7623767d9dfe3d85eb924 (diff) | |
Make Android cross-build working
In the spirit of 12759f67a36d52a345be6002d7017551e8414c59, change
external lib's config.sub to eat the arm-unknown-linux-androideabi
host os string. Also, permit shared libs again - seems Android can
handle those.
Added dictionaries to cross-build-toolset - idxdict is needed.
Should build up to sfx2 - some residual static lib issues there,
and in raptor.
Diffstat (limited to 'libtextcat')
| -rw-r--r-- | libtextcat/libexttextcat-3.0.1.patch | 19 | ||||
| -rw-r--r-- | libtextcat/makefile.mk | 3 |
2 files changed, 22 insertions, 0 deletions
diff --git a/libtextcat/libexttextcat-3.0.1.patch b/libtextcat/libexttextcat-3.0.1.patch new file mode 100644 index 000000000000..3128560dbd24 --- /dev/null +++ b/libtextcat/libexttextcat-3.0.1.patch @@ -0,0 +1,19 @@ +--- misc/libexttextcat-3.0.1/config.sub 2011-09-20 17:14:22.000000000 +0200 ++++ misc/build/libexttextcat-3.0.1/config.sub 2011-09-26 16:05:16.000000000 +0200 +@@ -320,7 +320,7 @@ + basic_machine=$basic_machine-pc + ;; + # Object if more than one company name word. +- *-*-*) ++ *-*-*-*) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 + ;; +@@ -1292,6 +1292,7 @@ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ ++ | -androideabi \ + | -chorusos* | -chorusrdb* | -cegcc* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk index c245c60f47f7..d7f7f1bc08b4 100644 --- a/libtextcat/makefile.mk +++ b/libtextcat/makefile.mk @@ -46,6 +46,9 @@ TARFILE_NAME=libexttextcat-3.0.1 TARFILE_MD5=131b91de2d1df0ff5f0a8284b5417f8b TARFILE_ROOTDIR=libexttextcat-3.0.1 +PATCH_FILES=\ + libexttextcat-3.0.1.patch + .IF "$(GUI)"=="UNX" #relative to CONFIGURE_DIR CONFIGURE_ACTION=configure --disable-shared --with-pic CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" |