summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/curl
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-02-17 10:53:10 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-22 06:09:20 -0800
commit2d898ad4a926065dbb04d4a8d77228d9ab3f1225 (patch)
tree2d63363034ea80f528dbf53e8852f0ceed262399 /meta/recipes-support/curl
parent05ad2468666540712a6e37526e4cf6ab1f2d91db (diff)
downloadpoky-2d898ad4a926065dbb04d4a8d77228d9ab3f1225.tar.gz
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 <cazfi74@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/curl')
-rw-r--r--meta/recipes-support/curl/curl-7.28.1/dont_override_ac_config_macro_dir.patch30
-rw-r--r--meta/recipes-support/curl/curl-7.28.1/obsolete_automake_macros.patch14
-rw-r--r--meta/recipes-support/curl/curl/pkgconfig_fix.patch25
-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 @@
1Upstream-Status: Inappropriate [configuration]
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd curl-7.28.1/m4/curl-override.m4 curl-7.28.1/m4/curl-override.m4
5--- curl-7.28.1/m4/curl-override.m4 2012-03-08 21:35:25.000000000 +0200
6+++ curl-7.28.1/m4/curl-override.m4 2013-01-12 09:46:21.337532290 +0200
7@@ -2,7 +2,8 @@
8 #***************************************************************************
9
10 # File version for 'aclocal' use. Keep it a single number.
11-# serial 5
12+# OE hack is second number so based between upstream version numbers.
13+# serial 5.1
14
15 dnl CURL_OVERRIDE_AUTOCONF
16 dnl -------------------------------------------------
17@@ -88,13 +89,3 @@
18 m4_defun([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR],
19 [CURL_CHECK_PATH_SEPARATOR
20 m4_define([$0],[])])
21-
22-dnl Override Autoconf's AC_CONFIG_MACRO_DIR (DIR)
23-dnl -------------------------------------------------
24-dnl This is an emulation of Autoconf's 2.61 macro.
25-dnl This is done to use fixed macro across Autoconf
26-dnl versions, and avoid warnings from modern libtool
27-dnl which traces usage of this macro.
28-
29-AC_DEFUN([AC_CONFIG_MACRO_DIR],[:])
30-
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 @@
1Upstream-Status: Backport
2
3Signed-off-by: Marko Lindqvist
4diff -Nurd curl-7.28.1/configure.ac curl-7.28.1/configure.ac
5--- curl-7.28.1/configure.ac 2012-09-08 23:39:18.000000000 +0300
6+++ curl-7.28.1/configure.ac 2013-01-12 09:15:27.753572960 +0200
7@@ -35,7 +35,7 @@
8 terms of the curl license; see COPYING for more details])
9
10 AC_CONFIG_SRCDIR([lib/urldata.h])
11-AM_CONFIG_HEADER(lib/curl_config.h include/curl/curlbuild.h)
12+AC_CONFIG_HEADERS([lib/curl_config.h include/curl/curlbuild.h])
13 AC_CONFIG_MACRO_DIR([m4])
14 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 @@
1Upstream-Status: Inappropriate [packaging] 1Upstream-Status: Inappropriate [packaging]
2 2
3diff -Nurd curl-7.28.1/configure.ac curl-7.28.1/configure.ac 3diff -Nurd curl-7.29.0/configure.ac curl-7.29.0/configure.ac
4--- curl-7.28.1/configure.ac 2012-09-08 23:39:18.000000000 +0300 4--- curl-7.29.0/configure.ac 2013-02-06 11:47:19.000000000 +0200
5+++ curl-7.28.1/configure.ac 2012-12-25 03:41:29.948026351 +0200 5+++ curl-7.29.0/configure.ac 2013-02-16 12:32:22.132327764 +0200
6@@ -1863,6 +1863,7 @@ 6@@ -1883,6 +1883,7 @@
7 AC_SUBST(USE_GNUTLS, [1]) 7 AC_SUBST(USE_GNUTLS, [1])
8 GNUTLS_ENABLED=1 8 GNUTLS_ENABLED=1
9 USE_GNUTLS="yes" 9 USE_GNUTLS="yes"
@@ -11,7 +11,7 @@ diff -Nurd curl-7.28.1/configure.ac curl-7.28.1/configure.ac
11 curl_ssl_msg="enabled (GnuTLS)" 11 curl_ssl_msg="enabled (GnuTLS)"
12 ], 12 ],
13 [ 13 [
14@@ -1933,6 +1934,8 @@ 14@@ -1953,6 +1954,8 @@
15 ]) 15 ])
16 fi 16 fi
17 17
@@ -20,16 +20,13 @@ diff -Nurd curl-7.28.1/configure.ac curl-7.28.1/configure.ac
20 dnl ---------------------------------------------------- 20 dnl ----------------------------------------------------
21 dnl check for PolarSSL 21 dnl check for PolarSSL
22 dnl ---------------------------------------------------- 22 dnl ----------------------------------------------------
23diff -Nurd curl-7.28.1/libcurl.pc.in curl-7.28.1/libcurl.pc.in 23diff -Nurd curl-7.29.0/libcurl.pc.in curl-7.29.0/libcurl.pc.in
24--- curl-7.28.1/libcurl.pc.in 2012-08-08 23:45:18.000000000 +0300 24--- curl-7.29.0/libcurl.pc.in 2012-12-12 00:32:22.000000000 +0200
25+++ curl-7.28.1/libcurl.pc.in 2012-12-25 03:43:23.564023858 +0200 25+++ curl-7.29.0/libcurl.pc.in 2013-02-16 12:33:27.063844337 +0200
26@@ -34,6 +34,7 @@ 26@@ -35,5 +35,5 @@
27 URL: http://curl.haxx.se/
28 Description: Library to transfer files with ftp, http, etc. 27 Description: Library to transfer files with ftp, http, etc.
29 Version: @CURLVERSION@ 28 Version: @CURLVERSION@
30-Libs: -L${libdir} -lcurl @LIBS@ 29 Libs: -L${libdir} -lcurl
31-Libs.private: @LIBCURL_LIBS@ @LIBS@ 30-Libs.private: @LIBCURL_LIBS@
32+Requires.private: @GNUTLS_REQUIRED@
33+Libs: -L${libdir} -lcurl
34+Libs.private: -ldl -lz 31+Libs.private: -ldl -lz
35 Cflags: -I${includedir} @CPPFLAG_CURL_STATICLIB@ 32 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
8DEPENDS = "zlib gnutls" 8DEPENDS = "zlib gnutls"
9DEPENDS_class-native = "zlib-native openssl-native" 9DEPENDS_class-native = "zlib-native openssl-native"
10DEPENDS_class-nativesdk = "nativesdk-zlib" 10DEPENDS_class-nativesdk = "nativesdk-zlib"
11PR = "r3" 11PR = "r0"
12 12
13SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ 13SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
14 file://pkgconfig_fix.patch \ 14 file://pkgconfig_fix.patch \
15 file://obsolete_automake_macros.patch \
16 file://dont_override_ac_config_macro_dir.patch \
17" 15"
18 16
19# curl likes to set -g0 in CFLAGS, so we stop it 17# 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 \
21# 19#
22SRC_URI += " file://configure_ac.patch" 20SRC_URI += " file://configure_ac.patch"
23 21
24SRC_URI[md5sum] = "26eb081c999b0e203770869427e9a93d" 22SRC_URI[md5sum] = "fa5f37f38a8042020e292ce7ec5341ce"
25SRC_URI[sha256sum] = "e569d6deb58a516e6858cd4c348949e0397433e1354666bafde1a52d1ea77367" 23SRC_URI[sha256sum] = "9d78e8bac6fa101679ca82e72a24e55918c5d495d29acb1eff62610929d3832f"
26 24
27inherit autotools pkgconfig binconfig 25inherit autotools pkgconfig binconfig
28 26
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-17 06:35:00 +0000