04b8b4fbbb
In the spirit of 12759f67a3, 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.
114 lines
4.2 KiB
Diff
114 lines
4.2 KiB
Diff
--- 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-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 @@
|
|
|
|
ac_ext=c
|
|
ac_cpp='$CPP $CPPFLAGS'
|
|
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
|
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
|
+ac_compile='$CC -c $ADDCFLAGS $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
|
+ac_link='$CC -o conftest$ac_exeext $ADDCFLAGS $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
|
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|
|
|
|
|
@@ -3783,8 +3783,8 @@
|
|
ac_save_CPPFLAGS="$CPPFLAGS"
|
|
ac_ext=c
|
|
ac_cpp='$CPP $CPPFLAGS'
|
|
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
|
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
|
+ac_compile='$CC -c $ADDCFLAGS $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
|
+ac_link='$CC -o conftest$ac_exeext $ADDCFLAGS $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
|
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|
if test -n "$ac_tool_prefix"; then
|
|
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
|
|
@@ -4434,15 +4434,15 @@
|
|
CFLAGS=$ac_save_CFLAGS
|
|
elif test $ac_cv_prog_cc_g = yes; then
|
|
if test "$GCC" = yes; then
|
|
- CFLAGS="-g -O2"
|
|
+ CFLAGS="$ADDCFLAGS -g -O2"
|
|
else
|
|
- CFLAGS="-g"
|
|
+ CFLAGS="$ADDCFLAGS -g"
|
|
fi
|
|
else
|
|
if test "$GCC" = yes; then
|
|
- CFLAGS="-O2"
|
|
+ CFLAGS="$ADDCFLAGS -O2"
|
|
else
|
|
- CFLAGS=
|
|
+ CFLAGS="$ADDCFLAGS"
|
|
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 @@
|
|
# include <winsock2.h>
|
|
# ifdef HAVE_WS2TCPIP_H
|
|
# include <ws2tcpip.h>
|
|
+# include <wspiapi.h>
|
|
# endif
|
|
# else
|
|
# ifdef HAVE_WINSOCK_H
|
|
--- misc/curl-7.19.7/ltmain.sh 2009-11-04 13:25:51.000000000 +0100
|
|
+++ misc/build/curl-7.19.7/ltmain.sh 2009-11-18 14:37:08.046875000 +0100
|
|
@@ -6188,13 +6188,13 @@
|
|
# which has an extra 1 added just for fun
|
|
#
|
|
case $version_type in
|
|
- darwin|linux|osf|windows|none)
|
|
+ darwin|linux|osf|windows|freebsd-aout|freebsd-elf|none)
|
|
func_arith $number_major + $number_minor
|
|
current=$func_arith_result
|
|
age="$number_minor"
|
|
revision="$number_revision"
|
|
;;
|
|
- freebsd-aout|freebsd-elf|sunos)
|
|
+ sunos)
|
|
current="$number_major"
|
|
revision="$number_minor"
|
|
age="0"
|
|
@@ -6271,8 +6271,8 @@
|
|
;;
|
|
|
|
freebsd-elf)
|
|
- major=".$current"
|
|
- versuffix=".$current"
|
|
+ major=.`expr $current - $age`
|
|
+ versuffix="$major"
|
|
;;
|
|
|
|
irix | nonstopux)
|