curl: Update to 7.29.0.

[people/amarx/ipfire-3.x.git] / curl / patches / 0102-curl-7.29.0-debug.patch

diff --git a/curl/patches/curl-7.21.2-debug.patch b/curl/patches/0102-curl-7.29.0-debug.patch
similarity index 72%
rename from curl/patches/curl-7.21.2-debug.patch
rename to curl/patches/0102-curl-7.29.0-debug.patch
index 76918262e3e484547aa7bafdbd00658410cb71ad..7f70530083bcea007fc0d7fe61d680927fd0dd0d 100644 (file)
--- a/curl/patches/curl-7.21.2-debug.patch
+++ b/curl/patches/0102-curl-7.29.0-debug.patch
@@ -1,12 +1,18 @@
- configure            |   15 ++++-----------
- m4/curl-compilers.m4 |   15 ++++-----------
- 2 files changed, 8 insertions(+), 22 deletions(-)
+From 6710648c2b270c9ce68a7d9f1bba1222c7be8b58 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Wed, 31 Oct 2012 11:38:30 +0100
+Subject: [PATCH] prevent configure script from discarding -g in CFLAGS (#496778)
+
+---
+ configure            |   13 +++----------
+ m4/curl-compilers.m4 |   13 +++----------
+ 2 files changed, 6 insertions(+), 20 deletions(-)
 
 diff --git a/configure b/configure
-index d3ecf69..6d8f085 100755
+index 8f079a3..53b4774 100755
 --- a/configure
 +++ b/configure
-@@ -15040,18 +15040,11 @@ $as_echo "yes" >&6; }
+@@ -15759,18 +15759,11 @@ $as_echo "yes" >&6; }
      gccvhi=`echo $gccver | cut -d . -f1`
      gccvlo=`echo $gccver | cut -d . -f2`
      compiler_num=`(expr $gccvhi "*" 100 + $gccvlo) 2>/dev/null`
@@ -20,17 +26,16 @@ index d3ecf69..6d8f085 100755
 -    flags_dbg_all="$flags_dbg_all -gvms"
 +    flags_dbg_all=""
      flags_dbg_yes="-g"
--    flags_dbg_off="-g0"
+     flags_dbg_off=""
 -    flags_opt_all="-O -O0 -O1 -O2 -O3 -Os"
 -    flags_opt_yes="-O2"
-+    flags_dbg_off=""
 +    flags_opt_all=""
 +    flags_opt_yes=""
      flags_opt_off="-O0"
-   else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ 
+       if test -z "$SED"; then
 diff --git a/m4/curl-compilers.m4 b/m4/curl-compilers.m4
-index 1ea4d17..868d65a 100644
+index 0cbba7a..9175b5b 100644
 --- a/m4/curl-compilers.m4
 +++ b/m4/curl-compilers.m4
 @@ -148,18 +148,11 @@ AC_DEFUN([CURL_CHECK_COMPILER_GNU_C], [
@@ -47,12 +52,14 @@ index 1ea4d17..868d65a 100644
 -    flags_dbg_all="$flags_dbg_all -gvms"
 +    flags_dbg_all=""
      flags_dbg_yes="-g"
--    flags_dbg_off="-g0"
+     flags_dbg_off=""
 -    flags_opt_all="-O -O0 -O1 -O2 -O3 -Os"
 -    flags_opt_yes="-O2"
-+    flags_dbg_off=""
 +    flags_opt_all=""
 +    flags_opt_yes=""
      flags_opt_off="-O0"
+     CURL_CHECK_DEF([_WIN32], [], [silent])
    else
-     AC_MSG_RESULT([no])
+-- 
+1.7.1
+