From a7468f7a872f288577f4dc0146a931a4a179e2be Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Thu, 7 Jan 2016 14:11:09 +0800 Subject: curl: upgrade to 7.46 Signed-off-by: Chen Qi Signed-off-by: Richard Purdie --- meta/recipes-support/curl/curl_7.45.0.bb | 58 ------------------------------ meta/recipes-support/curl/curl_7.46.0.bb | 60 ++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 58 deletions(-) delete mode 100644 meta/recipes-support/curl/curl_7.45.0.bb create mode 100644 meta/recipes-support/curl/curl_7.46.0.bb (limited to 'meta/recipes-support/curl') diff --git a/meta/recipes-support/curl/curl_7.45.0.bb b/meta/recipes-support/curl/curl_7.45.0.bb deleted file mode 100644 index a7ed778291..0000000000 --- a/meta/recipes-support/curl/curl_7.45.0.bb +++ /dev/null @@ -1,58 +0,0 @@ -SUMMARY = "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" - -SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ - file://pkgconfig_fix.patch \ - " - -# curl likes to set -g0 in CFLAGS, so we stop it -# from mucking around with debug options -# -SRC_URI += " file://configure_ac.patch" - -SRC_URI[md5sum] = "62c1a352b28558f25ba6209214beadc8" -SRC_URI[sha256sum] = "65154e66b9f8a442b57c436904639507b4ac37ec13d6f8a48248f1b4012b98ea" - -inherit autotools pkgconfig binconfig multilib_header - -PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)} gnutls zlib" -PACKAGECONFIG_class-native = "ipv6 ssl zlib" -PACKAGECONFIG_class-nativesdk = "ipv6 ssl zlib" - -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," -PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openssl" -PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls" -PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" -PACKAGECONFIG[rtmpdump] = "--with-librtmp,--without-librtmp,rtmpdump" -PACKAGECONFIG[libssh2] = "--with-libssh2,--without-libssh2,libssh2" -PACKAGECONFIG[smb] = "--enable-smb,--disable-smb," - -EXTRA_OECONF = "--without-libidn \ - --enable-crypto-auth \ - --disable-ldap \ - --disable-ldaps \ - --with-ca-bundle=${sysconfdir}/ssl/certs/ca-certificates.crt \ -" -# see https://lists.yoctoproject.org/pipermail/poky/2013-December/009435.html -# We should ideally drop ac_cv_sizeof_off_t from site files but until then -EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', 'ac_cv_sizeof_off_t=8', '', d)}" - -do_install_append() { - oe_multilib_header curl/curlbuild.h -} - -do_install_append_class-target() { - # cleanup buildpaths from curl-config - sed -i -e 's,${STAGING_DIR_HOST},,g' ${D}${bindir}/curl-config -} - -PACKAGES =+ "lib${BPN}" - -FILES_lib${BPN} = "${libdir}/lib*.so.*" -RRECOMMENDS_lib${BPN} += "ca-certificates" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/curl/curl_7.46.0.bb b/meta/recipes-support/curl/curl_7.46.0.bb new file mode 100644 index 0000000000..f798886037 --- /dev/null +++ b/meta/recipes-support/curl/curl_7.46.0.bb @@ -0,0 +1,60 @@ +SUMMARY = "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" + +SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ + file://pkgconfig_fix.patch \ + " + +# curl likes to set -g0 in CFLAGS, so we stop it +# from mucking around with debug options +# +SRC_URI += " file://configure_ac.patch" + +SRC_URI[md5sum] = "9979f989a2a9930d10f1b3deeabc2148" +SRC_URI[sha256sum] = "b7d726cdd8ed4b6db0fa1b474a3c59ebbbe4dcd4c61ac5e7ade0e0270d3195ad" + +inherit autotools pkgconfig binconfig multilib_header + +PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)} gnutls zlib" +PACKAGECONFIG_class-native = "ipv6 ssl zlib" +PACKAGECONFIG_class-nativesdk = "ipv6 ssl zlib" + +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," +PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openssl" +PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls" +PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" +PACKAGECONFIG[rtmpdump] = "--with-librtmp,--without-librtmp,rtmpdump" +PACKAGECONFIG[libssh2] = "--with-libssh2,--without-libssh2,libssh2" +PACKAGECONFIG[smb] = "--enable-smb,--disable-smb," + +EXTRA_OECONF = "--without-libidn \ + --enable-crypto-auth \ + --disable-ldap \ + --disable-ldaps \ + --with-ca-bundle=${sysconfdir}/ssl/certs/ca-certificates.crt \ +" +# see https://lists.yoctoproject.org/pipermail/poky/2013-December/009435.html +# We should ideally drop ac_cv_sizeof_off_t from site files but until then +EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', 'ac_cv_sizeof_off_t=8', '', d)}" + +do_install_append() { + oe_multilib_header curl/curlbuild.h +} + +do_install_append_class-target() { + # cleanup buildpaths from curl-config + sed -i -e 's,${STAGING_DIR_HOST},,g' ${D}${bindir}/curl-config +} + +PACKAGES =+ "lib${BPN}" + +FILES_lib${BPN} = "${libdir}/lib*.so.*" +RRECOMMENDS_lib${BPN} += "ca-certificates" + +FILES_${PN} += "${datadir}/zsh" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3