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 /curl | |
| 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 'curl')
| -rw-r--r-- | curl/curl-7.19.7.patch | 27 | ||||
| -rw-r--r-- | curl/makefile.mk | 4 |
2 files changed, 20 insertions, 11 deletions
diff --git a/curl/curl-7.19.7.patch b/curl/curl-7.19.7.patch index ca25c230762b..37e8c9a830d0 100644 --- a/curl/curl-7.19.7.patch +++ b/curl/curl-7.19.7.patch @@ -1,14 +1,23 @@ ---- misc/curl-7.19.7/config.sub -+++ misc/build/curl-7.19.7/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* \ +--- misc/curl-7.19.7/config.sub 2009-11-04 13:26:13.000000000 +0100 ++++ misc/build/curl-7.19.7/config.sub 2011-09-26 17:29:12.000000000 +0200 +@@ -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*) +@@ -1282,7 +1282,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-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* \ --- misc/curl-7.19.7/configure 2009-11-04 13:26:02.000000000 +0100 +++ misc/build/curl-7.19.7/configure 2009-11-18 14:17:25.453125000 +0100 @@ -2735,8 +2735,8 @@ diff --git a/curl/makefile.mk b/curl/makefile.mk index c2a92e71fe08..862ff2c555ca 100644 --- a/curl/makefile.mk +++ b/curl/makefile.mk @@ -94,10 +94,10 @@ BUILD_DIR=$(CONFIGURE_DIR)$/lib BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) -.IF "$(OS)"=="IOS" || "$(OS)"=="ANDROID" +.IF "$(OS)"=="IOS" OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl.a .ELSE -OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl$(DLLPOST).4 +OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl$(DLLPOST).? .ENDIF .ENDIF # "$(GUI)"=="UNX" |