From: Constantin Musca <[email protected]> pkgconfig_fix.patch: Adapted to the new version
Signed-off-by: Constantin Musca <[email protected]> Signed-off-by: Radu Moisan <[email protected]> --- meta/recipes-support/curl/curl/pkgconfig_fix.patch | 25 +++++++++----------- .../curl/{curl_7.26.0.bb => curl_7.27.0.bb} | 6 ++--- 2 files changed, 14 insertions(+), 17 deletions(-) rename meta/recipes-support/curl/{curl_7.26.0.bb => curl_7.27.0.bb} (92%) diff --git a/meta/recipes-support/curl/curl/pkgconfig_fix.patch b/meta/recipes-support/curl/curl/pkgconfig_fix.patch index ad73c00..f156cb4 100644 --- a/meta/recipes-support/curl/curl/pkgconfig_fix.patch +++ b/meta/recipes-support/curl/curl/pkgconfig_fix.patch @@ -1,11 +1,8 @@ -Upstream-Status: Inappropriate [packaging] - - -Index: curl-7.20.0/libcurl.pc.in +Index: curl-7.27.0/libcurl.pc.in =================================================================== ---- curl-7.20.0.orig/libcurl.pc.in 2009-11-17 18:11:07.000000000 +0000 -+++ curl-7.20.0/libcurl.pc.in 2010-03-25 12:13:26.814051066 +0000 -@@ -35,6 +35,7 @@ +--- curl-7.27.0.orig/libcurl.pc.in ++++ curl-7.27.0/libcurl.pc.in +@@ -34,6 +34,7 @@ Name: libcurl URL: http://curl.haxx.se/ Description: Library to transfer files with ftp, http, etc. Version: @CURLVERSION@ @@ -14,12 +11,12 @@ Index: curl-7.20.0/libcurl.pc.in +Requires.private: @GNUTLS_REQUIRED@ +Libs: -L${libdir} -lcurl +Libs.private: -ldl -lz - Cflags: -I${includedir} -Index: curl-7.20.0/configure.ac + Cflags: -I${includedir} @CPPFLAG_CURL_STATICLIB@ +Index: curl-7.27.0/configure.ac =================================================================== ---- curl-7.20.0.orig/configure.ac 2010-02-04 21:41:46.000000000 +0000 -+++ curl-7.20.0/configure.ac 2010-03-25 12:12:18.673129001 +0000 -@@ -1668,6 +1668,7 @@ +--- curl-7.27.0.orig/configure.ac ++++ curl-7.27.0/configure.ac +@@ -1863,6 +1863,7 @@ if test "$curl_ssl_msg" = "$init_ssl_msg AC_SUBST(USE_GNUTLS, [1]) GNUTLS_ENABLED=1 USE_GNUTLS="yes" @@ -27,9 +24,9 @@ Index: curl-7.20.0/configure.ac curl_ssl_msg="enabled (GnuTLS)" ], [ -@@ -1696,6 +1697,8 @@ +@@ -2102,6 +2103,8 @@ if test "$curl_ssl_msg" = "$init_ssl_msg - fi dnl OPENSSL != 1 + fi +AC_SUBST(GNUTLS_REQUIRED) + diff --git a/meta/recipes-support/curl/curl_7.26.0.bb b/meta/recipes-support/curl/curl_7.27.0.bb similarity index 92% rename from meta/recipes-support/curl/curl_7.26.0.bb rename to meta/recipes-support/curl/curl_7.27.0.bb index fef247c..2ba7837 100644 --- a/meta/recipes-support/curl/curl_7.26.0.bb +++ b/meta/recipes-support/curl/curl_7.27.0.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e66 DEPENDS = "zlib gnutls" DEPENDS_class-native = "zlib-native openssl-native" DEPENDS_class-nativesdk = "nativesdk-zlib" -PR = "r2" +PR = "r0" SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ file://pkgconfig_fix.patch" @@ -18,8 +18,8 @@ SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ # SRC_URI += " file://configure_ac.patch" -SRC_URI[md5sum] = "bfa80f01b3d300359cfb4d409b6136a3" -SRC_URI[sha256sum] = "fced262f16eb6bfcdcea15e04a7905ffcb5ff04b14a19ca35b9df86d6720d26a" +SRC_URI[md5sum] = "11fcbfc0de9c12512e607e7d72d500a0" +SRC_URI[sha256sum] = "aba5582135c28470b46084da9747470c1c680485fc91f9f0d3f7928df8169398" inherit autotools pkgconfig binconfig -- 1.7.9.5 _______________________________________________ Openembedded-core mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
