diff options
| -rw-r--r-- | meta/recipes-support/curl/curl/noldlibpath.patch | 2 | ||||
| -rw-r--r-- | meta/recipes-support/curl/curl/pkgconfig_fix.patch | 5 | ||||
| -rw-r--r-- | meta/recipes-support/curl/curl_7.21.6.bb (renamed from meta/recipes-support/curl/curl_7.21.2.bb) | 6 |
3 files changed, 9 insertions, 4 deletions
diff --git a/meta/recipes-support/curl/curl/noldlibpath.patch b/meta/recipes-support/curl/curl/noldlibpath.patch index a3319a23e3..f4c72a1c1c 100644 --- a/meta/recipes-support/curl/curl/noldlibpath.patch +++ b/meta/recipes-support/curl/curl/noldlibpath.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [embedded specific] + Manipulating LD_LIBRARY_PATH can totally break builds when cross compiling. Since we never run compiled binaries for the target, we should *never* need to change LD_LIBRARY_PATH. diff --git a/meta/recipes-support/curl/curl/pkgconfig_fix.patch b/meta/recipes-support/curl/curl/pkgconfig_fix.patch index a59d39b8b1..ad73c00885 100644 --- a/meta/recipes-support/curl/curl/pkgconfig_fix.patch +++ b/meta/recipes-support/curl/curl/pkgconfig_fix.patch @@ -1,3 +1,6 @@ +Upstream-Status: Inappropriate [packaging] + + Index: curl-7.20.0/libcurl.pc.in =================================================================== --- curl-7.20.0.orig/libcurl.pc.in 2009-11-17 18:11:07.000000000 +0000 @@ -5,7 +8,7 @@ Index: curl-7.20.0/libcurl.pc.in @@ -35,6 +35,7 @@ URL: http://curl.haxx.se/ Description: Library to transfer files with ftp, http, etc. - Version: @VERSION@ + Version: @CURLVERSION@ -Libs: -L${libdir} -lcurl @LIBS@ -Libs.private: @LIBCURL_LIBS@ @LIBS@ +Requires.private: @GNUTLS_REQUIRED@ diff --git a/meta/recipes-support/curl/curl_7.21.2.bb b/meta/recipes-support/curl/curl_7.21.6.bb index cc8bbf1a17..51e14f9c3d 100644 --- a/meta/recipes-support/curl/curl_7.21.2.bb +++ b/meta/recipes-support/curl/curl_7.21.6.bb @@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e66 DEPENDS = "zlib gnutls" DEPENDS_virtclass-native = "zlib-native" DEPENDS_virtclass-nativesdk = "zlib-nativesdk" -PR = "r1" +PR = "r0" SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ file://noldlibpath.patch \ file://pkgconfig_fix.patch" -SRC_URI[md5sum] = "ca96df88e044c7c25d19692ec8b250b2" -SRC_URI[sha256sum] = "f4a632e704f28767e6bbffcc6112db0590b1c9d50d8226d706ad39632355bf21" +SRC_URI[md5sum] = "6611989a81ebd7b03a35adc3001ddee0" +SRC_URI[sha256sum] = "d9a3d3593796147ad9ca994c9e6834a42b49756420a10e996dbf849495d3d955" inherit autotools pkgconfig binconfig |