summaryrefslogtreecommitdiff
path: root/packages/curl
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2008-03-18 14:13:27 +0000
committerRichard Purdie <rpurdie@rpsys.net>2008-03-18 14:13:27 +0000
commitaa8cf9bb8fc643558205327a136773774fe17eaf (patch)
treeb87e61633e50a827b6691c3266c79db5cb881fe4 /packages/curl
parentc8937b565f43038f3c9824728fecf290f1c4c4c3 (diff)
curl: Fix pkgconfig patch for when gnutls is disabled
Diffstat (limited to 'packages/curl')
-rw-r--r--packages/curl/curl_7.16.4.bb2
-rw-r--r--packages/curl/files/pkgconfig_fix.patch25
2 files changed, 24 insertions, 3 deletions
diff --git a/packages/curl/curl_7.16.4.bb b/packages/curl/curl_7.16.4.bb
index 555e5bc643..ef85358f3e 100644
--- a/packages/curl/curl_7.16.4.bb
+++ b/packages/curl/curl_7.16.4.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Command line tool and library for client-side URL transfers."
LICENSE = "MIT"
DEPENDS = "zlib gnutls"
SECTION = "console/network"
-PR = "r2"
+PR = "r3"
SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
file://pkgconfig_fix.patch;patch=1"
diff --git a/packages/curl/files/pkgconfig_fix.patch b/packages/curl/files/pkgconfig_fix.patch
index a5730095d2..e02316a73a 100644
--- a/packages/curl/files/pkgconfig_fix.patch
+++ b/packages/curl/files/pkgconfig_fix.patch
@@ -1,14 +1,35 @@
Index: curl-7.16.4/libcurl.pc.in
===================================================================
--- curl-7.16.4.orig/libcurl.pc.in 2007-02-18 09:41:27.000000000 +0000
-+++ curl-7.16.4/libcurl.pc.in 2008-02-29 12:19:32.000000000 +0000
++++ curl-7.16.4/libcurl.pc.in 2008-03-18 11:42:43.000000000 +0000
@@ -33,6 +33,7 @@
URL: http://curl.haxx.se/
Description: Library to transfer files with ftp, http, etc.
Version: @VERSION@
-Libs: -L${libdir} -lcurl @LDFLAGS@ @LIBS@
-Libs.private: @LIBCURL_LIBS@ @LIBS@
-+Requires.private: gnutls
++Requires.private: @GNUTLS_REQUIRED@
+Libs: -L${libdir} -lcurl
+Libs.private: -ldl -lz
Cflags: -I${includedir}
+Index: curl-7.16.4/configure.ac
+===================================================================
+--- curl-7.16.4.orig/configure.ac 2008-03-18 11:40:30.000000000 +0000
++++ curl-7.16.4/configure.ac 2008-03-18 11:42:06.000000000 +0000
+@@ -1361,6 +1361,7 @@
+ AC_SUBST(USE_GNUTLS, [1])
+ GNUTLS_ENABLED=1
+ USE_GNUTLS="yes"
++ GNUTLS_REQUIRED="gnutls"
+ curl_ssl_msg="enabled (GnuTLS)"
+ ],
+ [
+@@ -1387,6 +1388,8 @@
+
+ fi dnl OPENSSL != 1
+
++AC_SUBST(GNUTLS_REQUIRED)
++
+ dnl ----------------------------------------------------
+ dnl NSS. Only check if GnuTLS and OpenSSL are not enabled
+ dnl ----------------------------------------------------