diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-03-18 16:17:07 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-03-18 16:17:07 +0000 |
| commit | 2f9790385d297a571379a3099d44032ac4d5cf1f (patch) | |
| tree | bba797c705e1267b813b180f2ebd031e26b1041f /packages | |
| parent | 349e10e0cde31cc5dea6165c87591f18a71198e8 (diff) | |
| parent | cb4f4c74d2ef2463084cb8deff71c461475f2c43 (diff) | |
merge of '3bb98c788d34c3b10dae4f9f635695a0e8da61fc'
and '43c8d115f4121fbba5fab40e9d00365636b9fb62'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/curl/curl_7.16.4.bb | 2 | ||||
| -rw-r--r-- | packages/curl/files/pkgconfig_fix.patch | 25 |
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 ---------------------------------------------------- |