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 /redland | |
| 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 'redland')
| -rw-r--r-- | redland/raptor/makefile.mk | 2 | ||||
| -rw-r--r-- | redland/raptor/raptor-1.4.18.patch.autotools | 11 |
2 files changed, 1 insertions, 12 deletions
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index 50cc9eea7bb2..3b6f696cee45 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -159,7 +159,7 @@ OUT2INC+=src$/raptor.h .IF "$(OS)"=="MACOSX" OUT2LIB+=src$/.libs$/libraptor.$(RAPTOR_MAJOR).dylib src$/.libs$/libraptor.dylib OUT2BIN+=src/raptor-config -.ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID" +.ELIF "$(OS)"=="IOS" OUT2LIB+=src$/.libs$/libraptor.a OUT2BIN+=src/raptor-config .ELIF "$(OS)"=="AIX" diff --git a/redland/raptor/raptor-1.4.18.patch.autotools b/redland/raptor/raptor-1.4.18.patch.autotools index ed9e6bd75eff..4b43def56511 100644 --- a/redland/raptor/raptor-1.4.18.patch.autotools +++ b/redland/raptor/raptor-1.4.18.patch.autotools @@ -1,14 +1,3 @@ ---- misc/raptor-1.4.18/config.sub -+++ misc/build/raptor-1.4.18/config.sub -@@ -1272,7 +1272,7 @@ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ -- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ -+ | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ --- misc/raptor-1.4.18/configure Sun Jun 15 10:25:55 2008 +++ misc/build/raptor-1.4.18/configure Wed Feb 18 13:23:12 2009 @@ -4321,7 +4321,7 @@ |