diff options
| author | sb <sb@openoffice.org> | 2010-02-25 12:46:45 +0100 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-02-25 12:46:45 +0100 |
| commit | 8c4ad73ac17ae41517e26dfe956aeb5c3a155ca8 (patch) | |
| tree | 0367e8205d3337922d801998996b33298f6ce3ac /curl/curl-7.19.7.patch | |
| parent | 0ddead3f82f68b1dad81a755a58419402ecaaa74 (diff) | |
| parent | 5cca2bce895c51bc076833e565c962e7bd9d8a4e (diff) | |
sb118: merged in DEV300_m72
Diffstat (limited to 'curl/curl-7.19.7.patch')
| -rw-r--r-- | curl/curl-7.19.7.patch | 83 |
1 files changed, 83 insertions, 0 deletions
diff --git a/curl/curl-7.19.7.patch b/curl/curl-7.19.7.patch new file mode 100644 index 000000000000..0e39cb700a35 --- /dev/null +++ b/curl/curl-7.19.7.patch @@ -0,0 +1,83 @@ +--- 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/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) |