summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/curl/curl-7.28.1
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support/curl/curl-7.28.1')
-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
2 files changed, 0 insertions, 44 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