From e7c6e6bbacc66a8ec1e0b7fb857e8b2e5c2a215c Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 8 Jan 2013 09:16:42 +0200 Subject: [PATCH] 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../obsolete_automake_macros.patch | 15 +++++++++++++++ meta/recipes-support/libgcrypt/libgcrypt_1.5.0.bb | 4 +++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-support/libgcrypt/libgcrypt-1.5.0/obsolete_automake_macros.patch 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 @@ +Upstream-Status: Submitted [https://bugs.g10code.com/gnupg/issue1459] + +Signed-off-by: Marko Lindqvist +diff -Nurd libgcrypt-1.5.0/configure.ac libgcrypt-1.5.0/configure.ac +--- libgcrypt-1.5.0/configure.ac 2011-06-29 11:53:22.000000000 +0300 ++++ libgcrypt-1.5.0/configure.ac 2013-01-03 07:12:26.854793677 +0200 +@@ -59,7 +59,7 @@ + + AC_CONFIG_SRCDIR([src/libgcrypt.vers]) + AM_INIT_AUTOMAKE([]) +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + AC_CONFIG_MACRO_DIR([m4]) + AC_CONFIG_LIBOBJ_DIR([compat]) + 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 @@ require libgcrypt.inc -PR = "r1" +PR = "r2" + +SRC_URI += "file://obsolete_automake_macros.patch" SRC_URI[md5sum] = "78f8f8bec4580f75b25816f7896d0389" SRC_URI[sha256sum] = "cc98b1f64c9ae3b0185099cef4ac6c436a849095edf87f34157f0bb10e187990"