summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-01-08 09:16:42 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-10 23:43:13 +0000
commite7c6e6bbacc66a8ec1e0b7fb857e8b2e5c2a215c (patch)
tree6a9906b6026221c38207ae03eadf624c83d0cd83
parent5f792a0b5e9e81c82e0544751bb1a2d461b666cc (diff)
downloadpoky-e7c6e6bbacc66a8ec1e0b7fb857e8b2e5c2a215c.tar.gz
libgcrypt: 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: 43bb038e17b110fe5d0c4f6d7fb2fa2bfa4193a9) 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/libgcrypt/libgcrypt-1.5.0/obsolete_automake_macros.patch15
-rw-r--r--meta/recipes-support/libgcrypt/libgcrypt_1.5.0.bb4
2 files changed, 18 insertions, 1 deletions
diff --git a/meta/recipes-support/libgcrypt/libgcrypt-1.5.0/obsolete_automake_macros.patch b/meta/recipes-support/libgcrypt/libgcrypt-1.5.0/obsolete_automake_macros.patch
new file mode 100644
index 0000000000..0dbfded89d
--- /dev/null
+++ b/meta/recipes-support/libgcrypt/libgcrypt-1.5.0/obsolete_automake_macros.patch
@@ -0,0 +1,15 @@
1Upstream-Status: Submitted [https://bugs.g10code.com/gnupg/issue1459]
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd libgcrypt-1.5.0/configure.ac libgcrypt-1.5.0/configure.ac
5--- libgcrypt-1.5.0/configure.ac 2011-06-29 11:53:22.000000000 +0300
6+++ libgcrypt-1.5.0/configure.ac 2013-01-03 07:12:26.854793677 +0200
7@@ -59,7 +59,7 @@
8
9 AC_CONFIG_SRCDIR([src/libgcrypt.vers])
10 AM_INIT_AUTOMAKE([])
11-AM_CONFIG_HEADER(config.h)
12+AC_CONFIG_HEADERS(config.h)
13 AC_CONFIG_MACRO_DIR([m4])
14 AC_CONFIG_LIBOBJ_DIR([compat])
15 AC_CANONICAL_HOST
diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.5.0.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.5.0.bb
index e552f79ac7..058c2d5f40 100644
--- a/meta/recipes-support/libgcrypt/libgcrypt_1.5.0.bb
+++ b/meta/recipes-support/libgcrypt/libgcrypt_1.5.0.bb
@@ -1,6 +1,8 @@
1require libgcrypt.inc 1require libgcrypt.inc
2 2
3PR = "r1" 3PR = "r2"
4
5SRC_URI += "file://obsolete_automake_macros.patch"
4 6
5SRC_URI[md5sum] = "78f8f8bec4580f75b25816f7896d0389" 7SRC_URI[md5sum] = "78f8f8bec4580f75b25816f7896d0389"
6SRC_URI[sha256sum] = "cc98b1f64c9ae3b0185099cef4ac6c436a849095edf87f34157f0bb10e187990" 8SRC_URI[sha256sum] = "cc98b1f64c9ae3b0185099cef4ac6c436a849095edf87f34157f0bb10e187990"