diff options
author | Marko Lindqvist <cazfi74@gmail.com> | 2013-02-17 10:53:10 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-22 06:09:20 -0800 |
commit | 2d898ad4a926065dbb04d4a8d77228d9ab3f1225 (patch) | |
tree | 2d63363034ea80f528dbf53e8852f0ceed262399 /meta/recipes-support/curl/curl-7.28.1/dont_override_ac_config_macro_dir.patch | |
parent | 05ad2468666540712a6e37526e4cf6ab1f2d91db (diff) | |
download | poky-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/curl-7.28.1/dont_override_ac_config_macro_dir.patch')
-rw-r--r-- | meta/recipes-support/curl/curl-7.28.1/dont_override_ac_config_macro_dir.patch | 30 |
1 files changed, 0 insertions, 30 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 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | ||
4 | diff -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 | - | ||