diff options
| -rw-r--r-- | meta/recipes-support/curl/curl-7.28.1/dont_override_ac_config_macro_dir.patch | 30 | ||||
| -rw-r--r-- | meta/recipes-support/curl/curl-7.28.1/obsolete_automake_macros.patch | 14 | ||||
| -rw-r--r-- | meta/recipes-support/curl/curl/pkgconfig_fix.patch | 25 | ||||
| -rw-r--r-- | meta/recipes-support/curl/curl_7.29.0.bb (renamed from meta/recipes-support/curl/curl_7.28.1.bb) | 8 |
4 files changed, 14 insertions, 63 deletions
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 <cazfi74@gmail.com> -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.29.0.bb index 91526f7827..01ffeca56f 100644 --- a/meta/recipes-support/curl/curl_7.28.1.bb +++ b/meta/recipes-support/curl/curl_7.29.0.bb @@ -8,12 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e66 DEPENDS = "zlib gnutls" DEPENDS_class-native = "zlib-native openssl-native" DEPENDS_class-nativesdk = "nativesdk-zlib" -PR = "r3" +PR = "r0" 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 @@ -21,8 +19,8 @@ SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ # SRC_URI += " file://configure_ac.patch" -SRC_URI[md5sum] = "26eb081c999b0e203770869427e9a93d" -SRC_URI[sha256sum] = "e569d6deb58a516e6858cd4c348949e0397433e1354666bafde1a52d1ea77367" +SRC_URI[md5sum] = "fa5f37f38a8042020e292ce7ec5341ce" +SRC_URI[sha256sum] = "9d78e8bac6fa101679ca82e72a24e55918c5d495d29acb1eff62610929d3832f" inherit autotools pkgconfig binconfig |