[Qemu-devel] [PATCH] Fix configure test for PBKDF2 in nettle

[Qemu-devel] [PATCH] Fix configure test for PBKDF2 in nettle

[Steven Luo]

From: Steven Luo <steven+qemu@steven676.net>

On my Debian jessie system, including nettle/pbkdf2.h does not cause
NULL to be defined, which causes the test to fail to compile.  Include
stddef.h to bring in a definition of NULL.

Cc: qemu-trivial@nongnu.org
Cc: qemu-stable@nongnu.org
Signed-off-by: Steven Luo <steven+qemu@steven676.net>
---
I suppose this could also be fixed by defining NULL ourselves, or by
replacing NULLs with 0s -- if one of those other approaches is
preferred, let me know.

 configure | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configure b/configure
index c37fc5f..0aae017 100755
--- a/configure
+++ b/configure
@@ -2342,6 +2342,7 @@ if test "$nettle" != "no"; then
         nettle="yes"
 
         cat > $TMPC << EOF
+#include <stddef.h>
 #include <nettle/pbkdf2.h>
 int main(void) {
      pbkdf2_hmac_sha256(8, NULL, 1000, 8, NULL, 8, NULL);
-- 
2.1.4

Re: [Qemu-devel] [PATCH] Fix configure test for PBKDF2 in nettle

[Michael Tokarev]

Applied to trivial, -thanks!

/mjt

Re: [Qemu-devel] [PATCH] Fix configure test for PBKDF2 in nettle

[Daniel P. Berrange]

On Thu, May 26, 2016 at 09:53:13PM -0700, Steven Luo wrote:
> From: Steven Luo <steven+qemu@steven676.net>
> 
> On my Debian jessie system, including nettle/pbkdf2.h does not cause
> NULL to be defined, which causes the test to fail to compile.  Include
> stddef.h to bring in a definition of NULL.
> 
> Cc: qemu-trivial@nongnu.org
> Cc: qemu-stable@nongnu.org
> Signed-off-by: Steven Luo <steven+qemu@steven676.net>
> ---
> I suppose this could also be fixed by defining NULL ourselves, or by
> replacing NULLs with 0s -- if one of those other approaches is
> preferred, let me know.

What you've done here looks just fine to me.

> 
>  configure | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/configure b/configure
> index c37fc5f..0aae017 100755
> --- a/configure
> +++ b/configure
> @@ -2342,6 +2342,7 @@ if test "$nettle" != "no"; then
>          nettle="yes"
>  
>          cat > $TMPC << EOF
> +#include <stddef.h>
>  #include <nettle/pbkdf2.h>
>  int main(void) {
>       pbkdf2_hmac_sha256(8, NULL, 1000, 8, NULL, 8, NULL);
> -- 
> 2.1.4
> 

Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|