From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 2 Mar 2012 14:52:46 +0000 (+0100)
Subject: curl: Disable testsuite.
X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Fipfire-3.x.git;a=commitdiff_plain;h=c22b07daf669f9c6f176f88df2c1713c1c19fd28

curl: Disable testsuite.

The testsuite ran remote tests which do not work very well
in PBS.
---

diff --git a/curl/curl.nm b/curl/curl.nm
index b171ecf2d..a35ff7693 100644
--- a/curl/curl.nm
+++ b/curl/curl.nm
@@ -5,7 +5,7 @@
 
 name       = curl
 version    = 7.24.0
-release    = 1
+release    = 2
 
 groups     = Application/Internet
 url        = http://www.curl.haxx.se/
@@ -29,10 +29,10 @@ build
 		groff
 		libidn-devel
 		libssh2-devel
-		libtool
+		libtool-devel
+		net-tools
 		nss-devel
 		openldap-devel
-		pkg-config
 		zlib-devel
 	end
 
@@ -53,9 +53,12 @@ build
 		autoreconf -vfi
 	end
 
-	test
-		make check
-	end
+	# The testsuite runs services which bind to ports and
+	# sends queries to the internet. This may fail in some
+	# occasions.
+	#test
+	#	make check
+	#end
 end
 
 packages
diff --git a/curl/patches/curl-7.21.2-debug.patch b/curl/patches/curl-7.21.2-debug.patch
new file mode 100644
index 000000000..76918262e
--- /dev/null
+++ b/curl/patches/curl-7.21.2-debug.patch
@@ -0,0 +1,58 @@
+ configure            |   15 ++++-----------
+ m4/curl-compilers.m4 |   15 ++++-----------
+ 2 files changed, 8 insertions(+), 22 deletions(-)
+
+diff --git a/configure b/configure
+index d3ecf69..6d8f085 100755
+--- a/configure
++++ b/configure
+@@ -15040,18 +15040,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`
+-    flags_dbg_all="-g -g0 -g1 -g2 -g3"
+-    flags_dbg_all="$flags_dbg_all -ggdb"
+-    flags_dbg_all="$flags_dbg_all -gstabs"
+-    flags_dbg_all="$flags_dbg_all -gstabs+"
+-    flags_dbg_all="$flags_dbg_all -gcoff"
+-    flags_dbg_all="$flags_dbg_all -gxcoff"
+-    flags_dbg_all="$flags_dbg_all -gdwarf-2"
+-    flags_dbg_all="$flags_dbg_all -gvms"
++    flags_dbg_all=""
+     flags_dbg_yes="-g"
+-    flags_dbg_off="-g0"
+-    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
+diff --git a/m4/curl-compilers.m4 b/m4/curl-compilers.m4
+index 1ea4d17..868d65a 100644
+--- a/m4/curl-compilers.m4
++++ b/m4/curl-compilers.m4
+@@ -148,18 +148,11 @@ AC_DEFUN([CURL_CHECK_COMPILER_GNU_C], [
+     gccvhi=`echo $gccver | cut -d . -f1`
+     gccvlo=`echo $gccver | cut -d . -f2`
+     compiler_num=`(expr $gccvhi "*" 100 + $gccvlo) 2>/dev/null`
+-    flags_dbg_all="-g -g0 -g1 -g2 -g3"
+-    flags_dbg_all="$flags_dbg_all -ggdb"
+-    flags_dbg_all="$flags_dbg_all -gstabs"
+-    flags_dbg_all="$flags_dbg_all -gstabs+"
+-    flags_dbg_all="$flags_dbg_all -gcoff"
+-    flags_dbg_all="$flags_dbg_all -gxcoff"
+-    flags_dbg_all="$flags_dbg_all -gdwarf-2"
+-    flags_dbg_all="$flags_dbg_all -gvms"
++    flags_dbg_all=""
+     flags_dbg_yes="-g"
+-    flags_dbg_off="-g0"
+-    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
+     AC_MSG_RESULT([no])