From 2d898ad4a926065dbb04d4a8d77228d9ab3f1225 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 17 Feb 2013 10:53:10 +0200 Subject: curl: update to upstream version 7.29.0 - obsolete_automake_macros.patch removed as it's part of upstream. - dont_override_ac_config_macro_dir.patch removed as no longer needed. - pkgconfig_fix.patch updated to apply cleanly (From OE-Core rev: b0c541236b4c4670ce77f55886b6ce02c562b8c2) Signed-off-by: Marko Lindqvist Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../dont_override_ac_config_macro_dir.patch | 30 ---------- .../curl-7.28.1/obsolete_automake_macros.patch | 14 ----- meta/recipes-support/curl/curl/pkgconfig_fix.patch | 25 ++++----- meta/recipes-support/curl/curl_7.28.1.bb | 64 ---------------------- meta/recipes-support/curl/curl_7.29.0.bb | 62 +++++++++++++++++++++ 5 files changed, 73 insertions(+), 122 deletions(-) delete mode 100644 meta/recipes-support/curl/curl-7.28.1/dont_override_ac_config_macro_dir.patch delete mode 100644 meta/recipes-support/curl/curl-7.28.1/obsolete_automake_macros.patch delete mode 100644 meta/recipes-support/curl/curl_7.28.1.bb create mode 100644 meta/recipes-support/curl/curl_7.29.0.bb (limited to 'meta/recipes-support') diff --git a/meta/recipes-support/curl/curl-7.28.1/dont_override_ac_config_macro_dir.patch b/meta/recipes-support/curl/curl-7.28.1/dont_override_ac_config_macro_dir.patch deleted file mode 100644 index 6843bc628c..0000000000 --- a/meta/recipes-support/curl/curl-7.28.1/dont_override_ac_config_macro_dir.patch +++ /dev/null @@ -1,30 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Marko Lindqvist -diff -Nurd curl-7.28.1/m4/curl-override.m4 curl-7.28.1/m4/curl-override.m4 ---- curl-7.28.1/m4/curl-override.m4 2012-03-08 21:35:25.000000000 +0200 -+++ curl-7.28.1/m4/curl-override.m4 2013-01-12 09:46:21.337532290 +0200 -@@ -2,7 +2,8 @@ - #*************************************************************************** - - # File version for 'aclocal' use. Keep it a single number. --# serial 5 -+# OE hack is second number so based between upstream version numbers. -+# serial 5.1 - - dnl CURL_OVERRIDE_AUTOCONF - dnl ------------------------------------------------- -@@ -88,13 +89,3 @@ - m4_defun([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR], - [CURL_CHECK_PATH_SEPARATOR - m4_define([$0],[])]) -- --dnl Override Autoconf's AC_CONFIG_MACRO_DIR (DIR) --dnl ------------------------------------------------- --dnl This is an emulation of Autoconf's 2.61 macro. --dnl This is done to use fixed macro across Autoconf --dnl versions, and avoid warnings from modern libtool --dnl which traces usage of this macro. -- --AC_DEFUN([AC_CONFIG_MACRO_DIR],[:]) -- diff --git a/meta/recipes-support/curl/curl-7.28.1/obsolete_automake_macros.patch b/meta/recipes-support/curl/curl-7.28.1/obsolete_automake_macros.patch deleted file mode 100644 index 02b43b9b3f..0000000000 --- a/meta/recipes-support/curl/curl-7.28.1/obsolete_automake_macros.patch +++ /dev/null @@ -1,14 +0,0 @@ -Upstream-Status: Backport - -Signed-off-by: Marko Lindqvist -diff -Nurd curl-7.28.1/configure.ac curl-7.28.1/configure.ac ---- curl-7.28.1/configure.ac 2012-09-08 23:39:18.000000000 +0300 -+++ curl-7.28.1/configure.ac 2013-01-12 09:15:27.753572960 +0200 -@@ -35,7 +35,7 @@ - terms of the curl license; see COPYING for more details]) - - AC_CONFIG_SRCDIR([lib/urldata.h]) --AM_CONFIG_HEADER(lib/curl_config.h include/curl/curlbuild.h) -+AC_CONFIG_HEADERS([lib/curl_config.h include/curl/curlbuild.h]) - AC_CONFIG_MACRO_DIR([m4]) - AM_MAINTAINER_MODE diff --git a/meta/recipes-support/curl/curl/pkgconfig_fix.patch b/meta/recipes-support/curl/curl/pkgconfig_fix.patch index 7f4ef7daf6..5d8769d522 100644 --- a/meta/recipes-support/curl/curl/pkgconfig_fix.patch +++ b/meta/recipes-support/curl/curl/pkgconfig_fix.patch @@ -1,9 +1,9 @@ Upstream-Status: Inappropriate [packaging] -diff -Nurd curl-7.28.1/configure.ac curl-7.28.1/configure.ac ---- curl-7.28.1/configure.ac 2012-09-08 23:39:18.000000000 +0300 -+++ curl-7.28.1/configure.ac 2012-12-25 03:41:29.948026351 +0200 -@@ -1863,6 +1863,7 @@ +diff -Nurd curl-7.29.0/configure.ac curl-7.29.0/configure.ac +--- curl-7.29.0/configure.ac 2013-02-06 11:47:19.000000000 +0200 ++++ curl-7.29.0/configure.ac 2013-02-16 12:32:22.132327764 +0200 +@@ -1883,6 +1883,7 @@ AC_SUBST(USE_GNUTLS, [1]) GNUTLS_ENABLED=1 USE_GNUTLS="yes" @@ -11,7 +11,7 @@ diff -Nurd curl-7.28.1/configure.ac curl-7.28.1/configure.ac curl_ssl_msg="enabled (GnuTLS)" ], [ -@@ -1933,6 +1934,8 @@ +@@ -1953,6 +1954,8 @@ ]) fi @@ -20,16 +20,13 @@ diff -Nurd curl-7.28.1/configure.ac curl-7.28.1/configure.ac dnl ---------------------------------------------------- dnl check for PolarSSL dnl ---------------------------------------------------- -diff -Nurd curl-7.28.1/libcurl.pc.in curl-7.28.1/libcurl.pc.in ---- curl-7.28.1/libcurl.pc.in 2012-08-08 23:45:18.000000000 +0300 -+++ curl-7.28.1/libcurl.pc.in 2012-12-25 03:43:23.564023858 +0200 -@@ -34,6 +34,7 @@ - URL: http://curl.haxx.se/ +diff -Nurd curl-7.29.0/libcurl.pc.in curl-7.29.0/libcurl.pc.in +--- curl-7.29.0/libcurl.pc.in 2012-12-12 00:32:22.000000000 +0200 ++++ curl-7.29.0/libcurl.pc.in 2013-02-16 12:33:27.063844337 +0200 +@@ -35,5 +35,5 @@ Description: Library to transfer files with ftp, http, etc. Version: @CURLVERSION@ --Libs: -L${libdir} -lcurl @LIBS@ --Libs.private: @LIBCURL_LIBS@ @LIBS@ -+Requires.private: @GNUTLS_REQUIRED@ -+Libs: -L${libdir} -lcurl + Libs: -L${libdir} -lcurl +-Libs.private: @LIBCURL_LIBS@ +Libs.private: -ldl -lz Cflags: -I${includedir} @CPPFLAG_CURL_STATICLIB@ diff --git a/meta/recipes-support/curl/curl_7.28.1.bb b/meta/recipes-support/curl/curl_7.28.1.bb deleted file mode 100644 index 91526f7827..0000000000 --- a/meta/recipes-support/curl/curl_7.28.1.bb +++ /dev/null @@ -1,64 +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_class-native = "zlib-native openssl-native" -DEPENDS_class-nativesdk = "nativesdk-zlib" -PR = "r3" - -SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ - file://pkgconfig_fix.patch \ - file://obsolete_automake_macros.patch \ - file://dont_override_ac_config_macro_dir.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] = "26eb081c999b0e203770869427e9a93d" -SRC_URI[sha256sum] = "e569d6deb58a516e6858cd4c348949e0397433e1354666bafde1a52d1ea77367" - -inherit autotools pkgconfig binconfig - -EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \ - --without-libssh2 \ - --with-random=/dev/urandom \ - --without-libidn \ - --enable-crypto-auth \ - --disable-ldap \ - --disable-ldaps \ - ${CURLGNUTLS} \ - " - -CURLGNUTLS = " --with-gnutls=${STAGING_LIBDIR}/../ --without-ssl" -CURLGNUTLS_class-native = "--without-gnutls --with-ssl" -CURLGNUTLS_class-nativesdk = "--without-gnutls --without-ssl" - -do_configure_prepend() { - sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g ${S}/configure.ac -} - -PACKAGES =+ "${PN}-certs libcurl libcurl-dev libcurl-staticdev libcurl-doc" - -FILES_${PN}-certs = "${datadir}/curl/curl-*" -PACKAGE_ARCH_${PN}-certs = "all" - -FILES_lib${BPN} = "${libdir}/lib*.so.*" -RRECOMMENDS_lib${BPN} += "${PN}-certs" -FILES_lib${BPN}-dev = "${includedir} \ - ${libdir}/lib*.so \ - ${libdir}/lib*.la \ - ${libdir}/pkgconfig \ - ${datadir}/aclocal \ - ${bindir}/*-config" -FILES_lib${BPN}-staticdev = "${libdir}/lib*.a" -FILES_lib${BPN}-doc = "${mandir}/man3 \ - ${mandir}/man1/curl-config.1" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/curl/curl_7.29.0.bb b/meta/recipes-support/curl/curl_7.29.0.bb new file mode 100644 index 0000000000..01ffeca56f --- /dev/null +++ b/meta/recipes-support/curl/curl_7.29.0.bb @@ -0,0 +1,62 @@ +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_class-native = "zlib-native openssl-native" +DEPENDS_class-nativesdk = "nativesdk-zlib" +PR = "r0" + +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] = "fa5f37f38a8042020e292ce7ec5341ce" +SRC_URI[sha256sum] = "9d78e8bac6fa101679ca82e72a24e55918c5d495d29acb1eff62610929d3832f" + +inherit autotools pkgconfig binconfig + +EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \ + --without-libssh2 \ + --with-random=/dev/urandom \ + --without-libidn \ + --enable-crypto-auth \ + --disable-ldap \ + --disable-ldaps \ + ${CURLGNUTLS} \ + " + +CURLGNUTLS = " --with-gnutls=${STAGING_LIBDIR}/../ --without-ssl" +CURLGNUTLS_class-native = "--without-gnutls --with-ssl" +CURLGNUTLS_class-nativesdk = "--without-gnutls --without-ssl" + +do_configure_prepend() { + sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g ${S}/configure.ac +} + +PACKAGES =+ "${PN}-certs libcurl libcurl-dev libcurl-staticdev libcurl-doc" + +FILES_${PN}-certs = "${datadir}/curl/curl-*" +PACKAGE_ARCH_${PN}-certs = "all" + +FILES_lib${BPN} = "${libdir}/lib*.so.*" +RRECOMMENDS_lib${BPN} += "${PN}-certs" +FILES_lib${BPN}-dev = "${includedir} \ + ${libdir}/lib*.so \ + ${libdir}/lib*.la \ + ${libdir}/pkgconfig \ + ${datadir}/aclocal \ + ${bindir}/*-config" +FILES_lib${BPN}-staticdev = "${libdir}/lib*.a" +FILES_lib${BPN}-doc = "${mandir}/man3 \ + ${mandir}/man1/curl-config.1" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf