From 0f6cdfee4259fefa70a6d7674cf852fb6eeead3d Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 20 Mar 2008 12:53:42 +0000 Subject: curl: upgraded to 7.18.0 (latest stable) git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4103 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/packages/curl/curl-native_7.16.4.bb | 14 --------- meta/packages/curl/curl-native_7.18.0.bb | 14 +++++++++ meta/packages/curl/curl-sdk_7.16.4.bb | 14 --------- meta/packages/curl/curl-sdk_7.18.0.bb | 14 +++++++++ meta/packages/curl/curl_7.16.4.bb | 53 -------------------------------- meta/packages/curl/curl_7.18.0.bb | 52 +++++++++++++++++++++++++++++++ 6 files changed, 80 insertions(+), 81 deletions(-) delete mode 100644 meta/packages/curl/curl-native_7.16.4.bb create mode 100644 meta/packages/curl/curl-native_7.18.0.bb delete mode 100644 meta/packages/curl/curl-sdk_7.16.4.bb create mode 100644 meta/packages/curl/curl-sdk_7.18.0.bb delete mode 100644 meta/packages/curl/curl_7.16.4.bb create mode 100644 meta/packages/curl/curl_7.18.0.bb diff --git a/meta/packages/curl/curl-native_7.16.4.bb b/meta/packages/curl/curl-native_7.16.4.bb deleted file mode 100644 index e056ec10c..000000000 --- a/meta/packages/curl/curl-native_7.16.4.bb +++ /dev/null @@ -1,14 +0,0 @@ -require curl_${PV}.bb -inherit native -DEPENDS = "zlib-native" - -do_stage () { - install -d ${STAGING_INCDIR}/curl - install -m 0644 ${S}/include/curl/*.h ${STAGING_INCDIR}/curl/ - oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR} -} - -do_install() { - : -} - diff --git a/meta/packages/curl/curl-native_7.18.0.bb b/meta/packages/curl/curl-native_7.18.0.bb new file mode 100644 index 000000000..e056ec10c --- /dev/null +++ b/meta/packages/curl/curl-native_7.18.0.bb @@ -0,0 +1,14 @@ +require curl_${PV}.bb +inherit native +DEPENDS = "zlib-native" + +do_stage () { + install -d ${STAGING_INCDIR}/curl + install -m 0644 ${S}/include/curl/*.h ${STAGING_INCDIR}/curl/ + oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR} +} + +do_install() { + : +} + diff --git a/meta/packages/curl/curl-sdk_7.16.4.bb b/meta/packages/curl/curl-sdk_7.16.4.bb deleted file mode 100644 index 816fe645b..000000000 --- a/meta/packages/curl/curl-sdk_7.16.4.bb +++ /dev/null @@ -1,14 +0,0 @@ -require curl_${PV}.bb -inherit sdk -DEPENDS = "zlib-sdk" - -do_stage () { - install -d ${STAGING_INCDIR}/curl - install -m 0644 ${S}/include/curl/*.h ${STAGING_INCDIR}/curl/ - oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR} -} - -do_install() { - : -} - diff --git a/meta/packages/curl/curl-sdk_7.18.0.bb b/meta/packages/curl/curl-sdk_7.18.0.bb new file mode 100644 index 000000000..816fe645b --- /dev/null +++ b/meta/packages/curl/curl-sdk_7.18.0.bb @@ -0,0 +1,14 @@ +require curl_${PV}.bb +inherit sdk +DEPENDS = "zlib-sdk" + +do_stage () { + install -d ${STAGING_INCDIR}/curl + install -m 0644 ${S}/include/curl/*.h ${STAGING_INCDIR}/curl/ + oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR} +} + +do_install() { + : +} + diff --git a/meta/packages/curl/curl_7.16.4.bb b/meta/packages/curl/curl_7.16.4.bb deleted file mode 100644 index ef85358f3..000000000 --- a/meta/packages/curl/curl_7.16.4.bb +++ /dev/null @@ -1,53 +0,0 @@ -DESCRIPTION = "Command line tool and library for client-side URL transfers." -LICENSE = "MIT" -DEPENDS = "zlib gnutls" -SECTION = "console/network" -PR = "r3" - -SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ - file://pkgconfig_fix.patch;patch=1" -S = "${WORKDIR}/curl-${PV}" - -inherit autotools pkgconfig binconfig - -EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \ - --with-gnutls=${STAGING_BINDIR_CROSS}/ \ - --without-ssl \ - --without-libssh2 \ - --with-random=/dev/urandom \ - --without-libidn \ - --enable-crypto-auth \ - " - -do_configure_prepend() { - sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g configure.ac -} - -do_stage () { - install -d ${STAGING_INCDIR}/curl - install -m 0644 ${S}/include/curl/*.h ${STAGING_INCDIR}/curl/ - oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR} -} - -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" - diff --git a/meta/packages/curl/curl_7.18.0.bb b/meta/packages/curl/curl_7.18.0.bb new file mode 100644 index 000000000..ae2cff6e1 --- /dev/null +++ b/meta/packages/curl/curl_7.18.0.bb @@ -0,0 +1,52 @@ +DESCRIPTION = "Command line tool and library for client-side URL transfers." +LICENSE = "MIT" +DEPENDS = "zlib gnutls" +SECTION = "console/network" + +SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ + file://pkgconfig_fix.patch;patch=1" +S = "${WORKDIR}/curl-${PV}" + +inherit autotools pkgconfig binconfig + +EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \ + --with-gnutls=${STAGING_BINDIR_CROSS}/ \ + --without-ssl \ + --without-libssh2 \ + --with-random=/dev/urandom \ + --without-libidn \ + --enable-crypto-auth \ + " + +do_configure_prepend() { + sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g configure.ac +} + +do_stage () { + install -d ${STAGING_INCDIR}/curl + install -m 0644 ${S}/include/curl/*.h ${STAGING_INCDIR}/curl/ + oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR} +} + +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" + -- cgit v1.2.3