summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-01-08 09:16:43 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-10 23:43:13 +0000
commite5cc7ad6a25d3898bef53f06b57fc117440f4f91 (patch)
treed322edcf71577beb47fd6795649a46c72d91368d
parente7c6e6bbacc66a8ec1e0b7fb857e8b2e5c2a215c (diff)
downloadpoky-e5cc7ad6a25d3898bef53f06b57fc117440f4f91.tar.gz
gnutls: replace obsolete automake macros with working ones
Add obsolete_automake_macros.patch that replaces automake macros no longer supported by automake-1.13 with modern constructs. (From OE-Core rev: 861857cc3df0ad12172bb76b09769e43c95b73c6) 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>
-rw-r--r--meta/recipes-support/gnutls/gnutls/obsolete_automake_macros.patch39
-rw-r--r--meta/recipes-support/gnutls/gnutls_2.12.21.bb3
2 files changed, 41 insertions, 1 deletions
diff --git a/meta/recipes-support/gnutls/gnutls/obsolete_automake_macros.patch b/meta/recipes-support/gnutls/gnutls/obsolete_automake_macros.patch
new file mode 100644
index 0000000000..564017878f
--- /dev/null
+++ b/meta/recipes-support/gnutls/gnutls/obsolete_automake_macros.patch
@@ -0,0 +1,39 @@
1Upstream-Status: Submitted [https://savannah.gnu.org/support/index.php?108219]
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd gnutls-2.12.21/configure.ac gnutls-2.12.21/configure.ac
5--- gnutls-2.12.21/configure.ac 2013-01-03 07:52:42.182740682 +0200
6+++ gnutls-2.12.21/configure.ac 2013-01-03 07:53:41.662739378 +0200
7@@ -29,7 +29,7 @@
8 AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-bzip2 -Wall -Wno-override])
9 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
10 m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) # required by automake 1.12
11-AM_CONFIG_HEADER(config.h)
12+AC_CONFIG_HEADERS(config.h)
13
14 AC_MSG_RESULT([***
15 *** Checking for compilation programs...
16diff -Nurd gnutls-2.12.21/lib/configure.ac gnutls-2.12.21/lib/configure.ac
17--- gnutls-2.12.21/lib/configure.ac 2013-01-03 07:52:42.182740682 +0200
18+++ gnutls-2.12.21/lib/configure.ac 2013-01-03 08:07:38.150721027 +0200
19@@ -29,7 +29,7 @@
20 AM_INIT_AUTOMAKE([1.10 -Wall -Wno-override])
21 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
22 m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) # required by automake 1.12
23-AM_CONFIG_HEADER(config.h)
24+AC_CONFIG_HEADERS(config.h)
25
26 AC_PROG_CC
27 lgl_EARLY
28diff -Nurd gnutls-2.12.21/libextra/configure.ac gnutls-2.12.21/libextra/configure.ac
29--- gnutls-2.12.21/libextra/configure.ac 2013-01-03 07:52:42.182740682 +0200
30+++ gnutls-2.12.21/libextra/configure.ac 2013-01-03 08:10:56.654716669 +0200
31@@ -29,7 +29,7 @@
32 AM_INIT_AUTOMAKE([1.10 -Wall -Wno-override])
33 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
34 m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) # required by automake 1.12
35-AM_CONFIG_HEADER(config.h)
36+AC_CONFIG_HEADERS(config.h)
37
38 AC_PROG_CC
39 xgl_EARLY
diff --git a/meta/recipes-support/gnutls/gnutls_2.12.21.bb b/meta/recipes-support/gnutls/gnutls_2.12.21.bb
index 6b2ef3a2a3..7b4426bf26 100644
--- a/meta/recipes-support/gnutls/gnutls_2.12.21.bb
+++ b/meta/recipes-support/gnutls/gnutls_2.12.21.bb
@@ -1,12 +1,13 @@
1require gnutls.inc 1require gnutls.inc
2 2
3PR = "${INC_PR}.3" 3PR = "${INC_PR}.4"
4 4
5SRC_URI += "file://gnutls-openssl.patch \ 5SRC_URI += "file://gnutls-openssl.patch \
6 file://correct_rpl_gettimeofday_signature.patch \ 6 file://correct_rpl_gettimeofday_signature.patch \
7 file://configure-fix.patch \ 7 file://configure-fix.patch \
8 file://gnutls_fix_for_automake_1.12.1.patch \ 8 file://gnutls_fix_for_automake_1.12.1.patch \
9 file://avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch \ 9 file://avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch \
10 file://obsolete_automake_macros.patch \
10 ${@['', 'file://fix-gettext-version.patch'][bb.data.inherits_class('native', d) or (not ((d.getVar("INCOMPATIBLE_LICENSE", True) or "").find("GPLv3") != -1))]} \ 11 ${@['', 'file://fix-gettext-version.patch'][bb.data.inherits_class('native', d) or (not ((d.getVar("INCOMPATIBLE_LICENSE", True) or "").find("GPLv3") != -1))]} \
11 file://remove-gets.patch \ 12 file://remove-gets.patch \
12 " 13 "