diff options
author | Marko Lindqvist <cazfi74@gmail.com> | 2013-01-15 13:52:11 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-16 11:54:45 +0000 |
commit | 54a945a5e67c44be3e0b21114b7ca3abf8d99ada (patch) | |
tree | f9c85e78dac5f64fcdec685ef6144722c8c4a8c9 /meta/recipes-support/curl/curl-7.28.1/dont_override_ac_config_macro_dir.patch | |
parent | 074566f49be59b2f507ba427f258e1ca345da3c9 (diff) | |
download | openembedded-core-contrib-54a945a5e67c44be3e0b21114b7ca3abf8d99ada.tar.gz |
curl: fix build with automake-1.13
Add obsolete_automake_macros.patch that replaces automake macros
no longer supported by automake-1.13 with modern constructs.
Remove AC_CONFIG_MACRO_DIR override that caused aclocal to fail
since it didn't get m4-directory information.
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
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, 30 insertions, 0 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 new file mode 100644 index 0000000000..6843bc628c --- /dev/null +++ b/meta/recipes-support/curl/curl-7.28.1/dont_override_ac_config_macro_dir.patch @@ -0,0 +1,30 @@ +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],[:]) +- |