<div dir="ltr"><br><br><div class="gmail_quote"><div dir="ltr">On Tue, Feb 16, 2016 at 4:50 PM Richard Purdie &lt;<a href="mailto:richard.purdie@linuxfoundation.org">richard.purdie@linuxfoundation.org</a>&gt; wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">The underquoted m4 caused build failures if libgcrypt wasn&#39;t present. The floating<br>
dependency on libgcrypt was just plain incorrect, particularly given the incorrect<br>
libgcrypt RDEPENDS. Change to use PACKAGECONFIG an default to on.<br>
<br>
Signed-off-by: Richard Purdie &lt;<a href="mailto:richard.purdie@linuxfoundation.org" target="_blank">richard.purdie@linuxfoundation.org</a>&gt;<br>
<br>
diff --git a/meta/recipes-support/rng-tools/rng-tools/underquote.patch b/meta/recipes-support/rng-tools/rng-tools/underquote.patch<br>
new file mode 100644<br>
index 0000000..1422571<br>
--- /dev/null<br>
+++ b/meta/recipes-support/rng-tools/rng-tools/underquote.patch<br>
@@ -0,0 +1,31 @@<br>
+Fix underquoted m4 entry. This causes a failure if gcrypt isn&#39;t present:<br>
+<br>
+| configure: libgcrypt support disabled<br>
+| ../rng-tools-5/configure: line 4345: ac_fn_c_try_link: command not found<br>
+| configure: error: in `/media/build1/poky/build/tmp/work/i586-poky-linux/rng-tools/5-r0/build&#39;:<br>
+<br>
+RP<br>
+2016/2/16<br>
+<br>
+Index: rng-tools-5/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
+===================================================================<br>
+--- rng-tools-5.orig/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
++++ rng-tools-5/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
+@@ -71,7 +71,7 @@ AS_IF(<br>
+       [test &quot;x$with_libgcrypt&quot; != &quot;xno&quot;],<br>
+       [<br>
+               AC_CHECK_HEADER([gcrypt.h],<br>
+-                      AC_CHECK_LIB(<br>
++                      [AC_CHECK_LIB(<br>
+                               [gcrypt],<br>
+                               [gcry_check_version], ,<br>
+                               [<br>
+@@ -80,7 +80,7 @@ AS_IF(<br>
+                                               AC_MSG_NOTICE([libgcrypt support disabled])<br>
+                                       fi<br>
+                               ]<br>
+-                      ),<br>
++                      )],<br>
+                       [if test &quot;x$with_libgcrypt&quot; != &quot;xcheck&quot;; then<br>
+                               AC_MSG_FAILURE([libgcrypt headers not found]); else<br>
+                               AC_MSG_NOTICE([libgcrypt support disabled])<br>
diff --git a/meta/recipes-support/rng-tools/<a href="http://rng-tools_5.bb" rel="noreferrer" target="_blank">rng-tools_5.bb</a> b/meta/recipes-support/rng-tools/<a href="http://rng-tools_5.bb" rel="noreferrer" target="_blank">rng-tools_5.bb</a><br>
index 9a19d1c..bc67990 100644<br>
--- a/meta/recipes-support/rng-tools/<a href="http://rng-tools_5.bb" rel="noreferrer" target="_blank">rng-tools_5.bb</a><br>
+++ b/meta/recipes-support/rng-tools/<a href="http://rng-tools_5.bb" rel="noreferrer" target="_blank">rng-tools_5.bb</a><br>
@@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = &quot;file://COPYING;md5=0b6f033afe6db235e559456585dc8cdc&quot;<br>
 SRC_URI = &quot;<a href="http://heanet.dl.sourceforge.net/sourceforge/gkernel/$%7BBP%7D.tar.gz" rel="noreferrer" target="_blank">http://heanet.dl.sourceforge.net/sourceforge/gkernel/${BP}.tar.gz</a> \<br>
            file://0001-If-the-libc-is-lacking-argp-use-libargp.patch \<br>
            file://0002-Add-argument-to-control-the-libargp-dependency.patch \<br>
+           file://underquote.patch \<br>
            file://init \<br>
            file://default&quot;<br>
<br>
@@ -20,12 +21,11 @@ python () {<br>
<br>
 inherit autotools update-rc.d<br>
<br>
-PACKAGECONFIG = &quot;&quot;<br>
+PACKAGECONFIG = &quot;libgcrypt&quot;<br>
 PACKAGECONFIG_libc-musl = &quot;libargp&quot;<br>
 PACKAGECONFIG_libc-uclibc = &quot;libargp&quot;<br></blockquote><div><br></div><div>I&#39;m not sure how well musl/uclibc support libgcrypt, but this does end up not including gcrypt support for those libcs, unless we switch it to _append_libc-.</div></div></div>