deps: upgrade c-ares to piscisaureus/cares@805d153

This should fix the Android build.
sam-github · Jul 6, 2013 · 58e4eda · 58e4eda
1 parent 82ff891
commit 58e4eda
Show file tree

Hide file tree

Showing 7 changed files with 646 additions and 2 deletions.
diff --git a/deps/cares/.gitignore b/deps/cares/.gitignore
@@ -1,4 +1,5 @@
 /Debug/
+/build/gyp
 /out/
 /Release/
 

diff --git a/deps/cares/android-configure b/deps/cares/android-configure
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+export TOOLCHAIN=$PWD/android-toolchain
+mkdir -p $TOOLCHAIN
+$1/build/tools/make-standalone-toolchain.sh \
+    --toolchain=arm-linux-androideabi-4.7 \
+    --arch=arm \
+    --install-dir=$TOOLCHAIN \
+    --platform=android-9
+export PATH=$TOOLCHAIN/bin:$PATH
+export AR=arm-linux-androideabi-ar
+export CC=arm-linux-androideabi-gcc
+export CXX=arm-linux-androideabi-g++
+export LINK=arm-linux-androideabi-g++
+export PLATFORM=android
+export OS=android
+
+if [ $2 -a $2 == 'gyp' ]
+  then
+    ./gyp_cares -DOS=android -Dtarget_arch=arm
+fi
diff --git a/deps/cares/build.mk b/deps/cares/build.mk
@@ -107,6 +107,10 @@ ifeq (linux,$(OS))
 CFLAGS += -D_GNU_SOURCE
 endif
 
+ifeq (android,$(OS))
+CFLAGS += -D_GNU_SOURCE
+endif
+
 ifeq (sunos,$(OS))
 LDFLAGS += -lsocket -lnsl
 CFLAGS += -D__EXTENSIONS__ -D_XOPEN_SOURCE=500

diff --git a/deps/cares/cares.gyp b/deps/cares/cares.gyp
@@ -121,13 +121,17 @@
           # Not Windows i.e. POSIX
           'cflags': [
             '-g',
-            '--std=gnu89',
             '-pedantic',
             '-Wall',
             '-Wextra',
             '-Wno-unused-parameter'
           ],
         }],
+        [ 'OS not in "win android"', {
+          'cflags': [
+            '--std=gnu89'
+          ],
+        }],
         [ 'OS=="linux"', {
           'include_dirs': [ 'config/linux' ],
           'sources': [ 'config/linux/ares_config.h' ]
@@ -144,6 +148,10 @@
           'include_dirs': [ 'config/openbsd' ],
           'sources': [ 'config/openbsd/ares_config.h' ]
         }],
+        [ 'OS=="android"', {
+          'include_dirs': [ 'config/android' ],
+          'sources': [ 'config/android/ares_config.h' ],
+        }],
         [ 'OS=="solaris"', {
           'include_dirs': [ 'config/sunos' ],
           'sources': [ 'config/sunos/ares_config.h' ],

diff --git a/deps/cares/common.gypi b/deps/cares/common.gypi
@@ -137,7 +137,7 @@
         ],
       }],
 
-      [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
+      [ 'OS in "linux freebsd openbsd solaris android"', {
         'variables': {
           'gcc_version%': '<!(python build/gcc_version.py)>)'
         },