curl/curl-7.26.0.patch

   1 diff -ur curl-7.26.0/configure misc/build/curl-7.26.0/configure
   2 --- curl-7.26.0/configure       2012-07-02 13:28:51.327994494 +0200
   3 +++ misc/build/curl-7.26.0/configure    2012-07-02 13:32:38.754006822 +0200
   4 @@ -2693,8 +2693,8 @@
   5
   6  ac_ext=c
   7  ac_cpp='$CPP $CPPFLAGS'
   8 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
   9 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  10 +ac_compile='$CC -c $ADDCFLAGS $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  11 +ac_link='$CC -o conftest$ac_exeext $ADDCFLAGS $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  12  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  13
  14
  15 @@ -3855,8 +3855,8 @@
  16    ac_save_CPPFLAGS="$CPPFLAGS"
  17    ac_ext=c
  18  ac_cpp='$CPP $CPPFLAGS'
  19 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  20 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  21 +ac_compile='$CC -c $ADDCFLAGS $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  22 +ac_link='$CC -o conftest$ac_exeext $ADDCFLAGS $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  23  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  24  if test -n "$ac_tool_prefix"; then
  25    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  26 @@ -4506,15 +4506,15 @@
  27    CFLAGS=$ac_save_CFLAGS
  28  elif test $ac_cv_prog_cc_g = yes; then
  29    if test "$GCC" = yes; then
  30 -    CFLAGS="-g -O2"
  31 +    CFLAGS="$ADDCFLAGS -g -O2"
  32    else
  33 -    CFLAGS="-g"
  34 +    CFLAGS="$ADDCFLAGS -g"
  35    fi
  36  else
  37    if test "$GCC" = yes; then
  38 -    CFLAGS="-O2"
  39 +    CFLAGS="$ADDCFLAGS -O2"
  40    else
  41 -    CFLAGS=
  42 +    CFLAGS="$ADDCFLAGS"
  43    fi
  44  fi
  45  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
  46 diff -ur curl-7.26.0/lib/setup.h misc/build/curl-7.26.0/lib/setup.h
  47 --- curl-7.26.0/lib/setup.h     2012-07-02 13:28:51.322994494 +0200
  48 +++ misc/build/curl-7.26.0/lib/setup.h  2012-07-02 13:41:15.652034841 +0200
  49 @@ -231,6 +231,7 @@
  50  #    include <winsock2.h>
  51  #    ifdef HAVE_WS2TCPIP_H
  52  #       include <ws2tcpip.h>
  53 +#       include <wspiapi.h>
  54  #    endif
  55  #  else
  56  #    ifdef HAVE_WINSOCK_H
  57 diff -ur curl-7.26.0/ltmain.sh misc/build/curl-7.26.0/ltmain.sh
  58 --- curl-7.26.0/ltmain.sh       2012-07-02 13:28:51.298994493 +0200
  59 +++ misc/build/curl-7.26.0/ltmain.sh    2012-07-02 13:42:46.511039769 +0200
  60 @@ -7334,13 +7334,13 @@
  61           #
  62           case $version_type in
  63           # correct linux to gnu/linux during the next big refactor
  64 -         darwin|linux|osf|windows|none)
  65 +         darwin|linux|osf|windows|freebsd-aout|freebsd-elf|none)
  66             func_arith $number_major + $number_minor
  67             current=$func_arith_result
  68             age="$number_minor"
  69             revision="$number_revision"
  70             ;;
  71 -         freebsd-aout|freebsd-elf|qnx|sunos)
  72 +         qnx|sunos)
  73             current="$number_major"
  74             revision="$number_minor"
  75             age="0"
  76 @@ -7420,8 +7420,8 @@
  77           ;;
  78
  79         freebsd-elf)
  80 -         major=".$current"
  81 -         versuffix=".$current"
  82 +         major=.`expr $current - $age`
  83 +         versuffix="$major"
  84           ;;
  85
  86         irix | nonstopux)