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. (From OE-Core rev: 54a945a5e67c44be3e0b21114b7ca3abf8d99ada) 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>
This commit is contained in:
parent
0f948badad
commit
83f1e6975c
|
@ -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],[:])
|
||||
-
|
|
@ -0,0 +1,14 @@
|
|||
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
|
|
@ -8,10 +8,13 @@ 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 = "r2"
|
||||
PR = "r3"
|
||||
|
||||
SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
|
||||
file://pkgconfig_fix.patch"
|
||||
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
|
||||
|
|
Loading…
Reference in New Issue