From 7b26788c52136eb6a95507758936756b3dfcbaa4 Mon Sep 17 00:00:00 2001 From: Qing He Date: Fri, 22 Apr 2011 10:07:25 +0800 Subject: curl: upgrade to version 7.21.6 from 7.21.2 Signed-off-by: Qing He --- meta/recipes-support/curl/curl/noldlibpath.patch | 2 + meta/recipes-support/curl/curl/pkgconfig_fix.patch | 5 +- meta/recipes-support/curl/curl_7.21.2.bb | 61 ---------------------- meta/recipes-support/curl/curl_7.21.6.bb | 61 ++++++++++++++++++++++ 4 files changed, 67 insertions(+), 62 deletions(-) delete mode 100644 meta/recipes-support/curl/curl_7.21.2.bb create mode 100644 meta/recipes-support/curl/curl_7.21.6.bb diff --git a/meta/recipes-support/curl/curl/noldlibpath.patch b/meta/recipes-support/curl/curl/noldlibpath.patch index a3319a23e..f4c72a1c1 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 a59d39b8b..ad73c0088 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.2.bb deleted file mode 100644 index cc8bbf1a1..000000000 --- a/meta/recipes-support/curl/curl_7.21.2.bb +++ /dev/null @@ -1,61 +0,0 @@ -DESCRIPTION = "Command line tool and library for client-side URL transfers." -HOMEPAGE = "http://curl.haxx.se/" -BUGTRACKER = "http://curl.haxx.se/mail/list.cgi?list=curl-tracker" -SECTION = "console/network" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e664ac" - -DEPENDS = "zlib gnutls" -DEPENDS_virtclass-native = "zlib-native" -DEPENDS_virtclass-nativesdk = "zlib-nativesdk" -PR = "r1" - -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" - -inherit autotools pkgconfig binconfig - -EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \ - --without-ssl \ - --without-libssh2 \ - --with-random=/dev/urandom \ - --without-libidn \ - --enable-crypto-auth \ - ${CURLGNUTLS} \ - " - -CURLGNUTLS = " --with-gnutls=${STAGING_LIBDIR}/../" -CURLGNUTLS_virtclass-native = "--without-gnutls" -CURLGNUTLS_virtclass-nativesdk = "--without-gnutls" - -do_configure_prepend() { - sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g configure.ac -} - -PACKAGES += "${PN}-certs libcurl libcurl-dev libcurl-doc" - -FILES_${PN} = "${bindir}/curl" - -FILES_${PN}-certs = "${datadir}/curl/curl-*" -PACKAGE_ARCH_${PN}-certs = "all" - -FILES_${PN}-doc = "${mandir}/man1/curl.1" - -FILES_lib${PN} = "${libdir}/lib*.so.*" -RRECOMMENDS_lib${PN} += "${PN}-certs" -FILES_lib${PN}-dev = "${includedir} \ - ${libdir}/lib*.so \ - ${libdir}/lib*.a \ - ${libdir}/lib*.la \ - ${libdir}/pkgconfig \ - ${datadir}/aclocal \ - ${bindir}/*-config" - -FILES_lib${PN}-doc = "${mandir}/man3 \ - ${mandir}/man1/curl-config.1" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/curl/curl_7.21.6.bb b/meta/recipes-support/curl/curl_7.21.6.bb new file mode 100644 index 000000000..51e14f9c3 --- /dev/null +++ b/meta/recipes-support/curl/curl_7.21.6.bb @@ -0,0 +1,61 @@ +DESCRIPTION = "Command line tool and library for client-side URL transfers." +HOMEPAGE = "http://curl.haxx.se/" +BUGTRACKER = "http://curl.haxx.se/mail/list.cgi?list=curl-tracker" +SECTION = "console/network" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e664ac" + +DEPENDS = "zlib gnutls" +DEPENDS_virtclass-native = "zlib-native" +DEPENDS_virtclass-nativesdk = "zlib-nativesdk" +PR = "r0" + +SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ + file://noldlibpath.patch \ + file://pkgconfig_fix.patch" + +SRC_URI[md5sum] = "6611989a81ebd7b03a35adc3001ddee0" +SRC_URI[sha256sum] = "d9a3d3593796147ad9ca994c9e6834a42b49756420a10e996dbf849495d3d955" + +inherit autotools pkgconfig binconfig + +EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \ + --without-ssl \ + --without-libssh2 \ + --with-random=/dev/urandom \ + --without-libidn \ + --enable-crypto-auth \ + ${CURLGNUTLS} \ + " + +CURLGNUTLS = " --with-gnutls=${STAGING_LIBDIR}/../" +CURLGNUTLS_virtclass-native = "--without-gnutls" +CURLGNUTLS_virtclass-nativesdk = "--without-gnutls" + +do_configure_prepend() { + sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g configure.ac +} + +PACKAGES += "${PN}-certs libcurl libcurl-dev libcurl-doc" + +FILES_${PN} = "${bindir}/curl" + +FILES_${PN}-certs = "${datadir}/curl/curl-*" +PACKAGE_ARCH_${PN}-certs = "all" + +FILES_${PN}-doc = "${mandir}/man1/curl.1" + +FILES_lib${PN} = "${libdir}/lib*.so.*" +RRECOMMENDS_lib${PN} += "${PN}-certs" +FILES_lib${PN}-dev = "${includedir} \ + ${libdir}/lib*.so \ + ${libdir}/lib*.a \ + ${libdir}/lib*.la \ + ${libdir}/pkgconfig \ + ${datadir}/aclocal \ + ${bindir}/*-config" + +FILES_lib${PN}-doc = "${mandir}/man3 \ + ${mandir}/man1/curl-config.1" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3