diff options
| author | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-03-19 16:36:15 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-03-19 16:36:15 +0000 |
| commit | dc9026df7f693fc41e37cf265c73a8c3dbe7df57 (patch) | |
| tree | 52fd37b33fabe89b174fe6cfef08ed92e2b87d38 /meta/packages/curl/files/pkgconfig_fix.patch | |
| parent | df498e4081c7e538480306d4dd979d1995fe5e73 (diff) | |
| download | openembedded-core-dc9026df7f693fc41e37cf265c73a8c3dbe7df57.tar.gz openembedded-core-dc9026df7f693fc41e37cf265c73a8c3dbe7df57.tar.bz2 openembedded-core-dc9026df7f693fc41e37cf265c73a8c3dbe7df57.tar.xz openembedded-core-dc9026df7f693fc41e37cf265c73a8c3dbe7df57.zip | |
curl: merged 7.16.4 from OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4069 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/curl/files/pkgconfig_fix.patch')
| -rw-r--r-- | meta/packages/curl/files/pkgconfig_fix.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/meta/packages/curl/files/pkgconfig_fix.patch b/meta/packages/curl/files/pkgconfig_fix.patch new file mode 100644 index 000000000..e02316a73 --- /dev/null +++ b/meta/packages/curl/files/pkgconfig_fix.patch @@ -0,0 +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-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_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 ---------------------------------------------------- |