[PATCH 0/1] Allow libgcrypt to configure again

[PATCH 0/1] Allow libgcrypt to configure again

[Peter Kjellerstedt]

We have had troubles building libgcrypt for a while. It turned out to
be because needed m4 files were removed which caused autoreconf to
fail.

//Peter

The following changes since commit 6882d2d9993c8655a292c93e84ea01b4738a700d:

  yocto-project-qs, ref-manual: Added 'socat' package to essentials. (2014-08-12 13:50:32 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib pkj/libgcrypt
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=pkj/libgcrypt

Peter Kjellerstedt (1):
  libgcrypt: Do not remove m4 files so aggressively

 meta/recipes-support/libgcrypt/libgcrypt.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
1.9.0

[PATCH 1/1] libgcrypt: Do not remove m4 files so aggressively

[Peter Kjellerstedt]

Removing all m4 files in the m4 directory led to a number of non-fatal
errors while running configure when the expected m4 macros could not
be found.

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---
 meta/recipes-support/libgcrypt/libgcrypt.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-support/libgcrypt/libgcrypt.inc b/meta/recipes-support/libgcrypt/libgcrypt.inc
index fa2bc38..43e0291 100644
--- a/meta/recipes-support/libgcrypt/libgcrypt.inc
+++ b/meta/recipes-support/libgcrypt/libgcrypt.inc
@@ -23,8 +23,8 @@ inherit autotools-brokensep texinfo binconfig-disabled pkgconfig
 EXTRA_OECONF = "--disable-asm --with-capabilities"
 
 do_configure_prepend () {
-	# Else these could be used in prefernce to those in aclocal-copy
-	rm -f ${S}/m4/*.m4
+	# Else this could be used in preference to the one in aclocal-copy
+	rm -f ${S}/m4/gpg-error.m4
 }
 
 # libgcrypt.pc is added locally and thus installed here
-- 
1.9.0