From 496bba4a6898e0fda7a3ce0a74ed1dd254277992 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tlillqvist@novell.com>
Date: Thu, 9 Jun 2011 19:29:05 +0300
Subject: Cross-compilation support for Android

---
 curl/curl-7.19.7.patch | 22 ++++++++++++++++++++++
 curl/makefile.mk       |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)

(limited to 'curl')

diff --git a/curl/curl-7.19.7.patch b/curl/curl-7.19.7.patch
index 0e39cb700a35..ca25c230762b 100644
--- a/curl/curl-7.19.7.patch
+++ b/curl/curl-7.19.7.patch
@@ -1,3 +1,14 @@
+--- 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* \
+ 	      | -chorusos* | -chorusrdb* | -cegcc* \
+ 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
 --- 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 @@
@@ -42,6 +53,17 @@
    fi
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+--- misc/curl-7.19.7/include/curl/curl.h
++++ misc/build/curl-7.19.7/include/curl/curl.h
+@@ -74,7 +74,7 @@
+    require it! */
+ #if defined(_AIX) || defined(__NOVELL_LIBC__) || defined(__NetBSD__) || \
+     defined(__minix) || defined(__SYMBIAN32__) || defined(__INTEGRITY) || \
+-    defined(ANDROID)
++    defined(__ANDROID__)
+ #include <sys/select.h>
+ #endif
+ 
 --- misc/curl-7.19.7/lib/setup.h	2009-10-28 21:21:58.000000000 +0100
 +++ misc/build/curl-7.19.7/lib/setup.h	2009-11-18 13:30:42.375000000 +0100
 @@ -193,6 +193,7 @@
diff --git a/curl/makefile.mk b/curl/makefile.mk
index dc9d74d42e41..dfc5720e882a 100644
--- a/curl/makefile.mk
+++ b/curl/makefile.mk
@@ -94,7 +94,7 @@ BUILD_DIR=$(CONFIGURE_DIR)$/lib
 BUILD_ACTION=$(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 
-.IF "$(OS)"=="IOS"
+.IF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
 OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl.a
 .ELSE
 OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl$(DLLPOST).4
-- 
cgit v1.2.3