diff mbox series

[v3,3/3] buildsys: Move gcrypt cflags/libs to per object

Message ID 20170906074418.10903-4-famz@redhat.com
State New
Headers show
Series [v3,1/3] buildsys: Move nettle cflags/libs to per object | expand

Commit Message

Fam Zheng Sept. 6, 2017, 7:44 a.m. UTC 
Signed-off-by: Fam Zheng <famz@redhat.com>
---
 configure            | 5 ++---
 crypto/Makefile.objs | 7 +++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

Comments

Daniel P. Berrangé Sept. 6, 2017, 8:56 a.m. UTC | #1 
On Wed, Sep 06, 2017 at 03:44:18PM +0800, Fam Zheng wrote:
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
>  configure            | 5 ++---
>  crypto/Makefile.objs | 7 +++++++
>  2 files changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/configure b/configure
> index 6d90e73a8b..b37cd54bda 100755
> --- a/configure
> +++ b/configure
> @@ -2565,9 +2565,6 @@ if test "$gcrypt" != "no"; then
>          then
>              gcrypt_libs="$gcrypt_libs -lgpg-error"
>          fi
> -        libs_softmmu="$gcrypt_libs $libs_softmmu"
> -        libs_tools="$gcrypt_libs $libs_tools"
> -        QEMU_CFLAGS="$QEMU_CFLAGS $gcrypt_cflags"
>          gcrypt="yes"
>          if test -z "$nettle"; then
>             nettle="no"
> @@ -5715,6 +5712,8 @@ if test "$gnutls_rnd" = "yes" ; then
>  fi
>  if test "$gcrypt" = "yes" ; then
>    echo "CONFIG_GCRYPT=y" >> $config_host_mak
> +  echo "GCRYPT_CFLAGS=$gcrypt_cflags" >> $config_host_mak
> +  echo "GCRYPT_LIBS=$gcrypt_libs" >> $config_host_mak
>    if test "$gcrypt_hmac" = "yes" ; then
>      echo "CONFIG_GCRYPT_HMAC=y" >> $config_host_mak
>    fi
> diff --git a/crypto/Makefile.objs b/crypto/Makefile.objs
> index 0cb5fa24b6..45f7c0c80d 100644
> --- a/crypto/Makefile.objs
> +++ b/crypto/Makefile.objs
> @@ -34,6 +34,13 @@ crypto-obj-y += block.o
>  crypto-obj-y += block-qcow.o
>  crypto-obj-y += block-luks.o
>  
> +$(if $(CONFIG_GCRYPT), \
> +	$(foreach x, init cipher hash-gcrypt hmac-gcrypt random-gcrypt \
> +			pbkdf-gcrypt, \
> +		$(eval $x.o-cflags := $(NETTLE_CFLAGS)) \
> +		$(eval $x.o-libs := $(NETTLE_LIBS))) \
> +)
> +
>  $(if $(CONFIG_NETTLE), \
>  	$(foreach x, cipher hash-nettle hmac-nettle pbkdf-nettle, \
>  		$(eval $x.o-cflags := $(NETTLE_CFLAGS)) \

Reviewed-by: Daniel P. Berrange <berrange@redhat.com>

Regards,
Daniel
Fam Zheng Sept. 6, 2017, 9:25 a.m. UTC | #2 
On Wed, 09/06 09:56, Daniel P. Berrange wrote:
> On Wed, Sep 06, 2017 at 03:44:18PM +0800, Fam Zheng wrote:
> > Signed-off-by: Fam Zheng <famz@redhat.com>
> > ---
> >  configure            | 5 ++---
> >  crypto/Makefile.objs | 7 +++++++
> >  2 files changed, 9 insertions(+), 3 deletions(-)
> > 
> > diff --git a/configure b/configure
> > index 6d90e73a8b..b37cd54bda 100755
> > --- a/configure
> > +++ b/configure
> > @@ -2565,9 +2565,6 @@ if test "$gcrypt" != "no"; then
> >          then
> >              gcrypt_libs="$gcrypt_libs -lgpg-error"
> >          fi
> > -        libs_softmmu="$gcrypt_libs $libs_softmmu"
> > -        libs_tools="$gcrypt_libs $libs_tools"
> > -        QEMU_CFLAGS="$QEMU_CFLAGS $gcrypt_cflags"
> >          gcrypt="yes"
> >          if test -z "$nettle"; then
> >             nettle="no"
> > @@ -5715,6 +5712,8 @@ if test "$gnutls_rnd" = "yes" ; then
> >  fi
> >  if test "$gcrypt" = "yes" ; then
> >    echo "CONFIG_GCRYPT=y" >> $config_host_mak
> > +  echo "GCRYPT_CFLAGS=$gcrypt_cflags" >> $config_host_mak
> > +  echo "GCRYPT_LIBS=$gcrypt_libs" >> $config_host_mak
> >    if test "$gcrypt_hmac" = "yes" ; then
> >      echo "CONFIG_GCRYPT_HMAC=y" >> $config_host_mak
> >    fi
> > diff --git a/crypto/Makefile.objs b/crypto/Makefile.objs
> > index 0cb5fa24b6..45f7c0c80d 100644
> > --- a/crypto/Makefile.objs
> > +++ b/crypto/Makefile.objs
> > @@ -34,6 +34,13 @@ crypto-obj-y += block.o
> >  crypto-obj-y += block-qcow.o
> >  crypto-obj-y += block-luks.o
> >  
> > +$(if $(CONFIG_GCRYPT), \
> > +	$(foreach x, init cipher hash-gcrypt hmac-gcrypt random-gcrypt \
> > +			pbkdf-gcrypt, \
> > +		$(eval $x.o-cflags := $(NETTLE_CFLAGS)) \
> > +		$(eval $x.o-libs := $(NETTLE_LIBS))) \

Sorry, these should be GCRYPT_* :(

Fam

> > +)
> > +
> >  $(if $(CONFIG_NETTLE), \
> >  	$(foreach x, cipher hash-nettle hmac-nettle pbkdf-nettle, \
> >  		$(eval $x.o-cflags := $(NETTLE_CFLAGS)) \
> 
> Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
> 
> Regards,
> Daniel
> -- 
> |: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
> |: https://libvirt.org         -o-            https://fstop138.berrange.com :|
> |: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
>
diff mbox series

Patch

diff --git a/configure b/configure
index 6d90e73a8b..b37cd54bda 100755
--- a/configure
+++ b/configure
@@ -2565,9 +2565,6 @@  if test "$gcrypt" != "no"; then
         then
             gcrypt_libs="$gcrypt_libs -lgpg-error"
         fi
-        libs_softmmu="$gcrypt_libs $libs_softmmu"
-        libs_tools="$gcrypt_libs $libs_tools"
-        QEMU_CFLAGS="$QEMU_CFLAGS $gcrypt_cflags"
         gcrypt="yes"
         if test -z "$nettle"; then
            nettle="no"
@@ -5715,6 +5712,8 @@  if test "$gnutls_rnd" = "yes" ; then
 fi
 if test "$gcrypt" = "yes" ; then
   echo "CONFIG_GCRYPT=y" >> $config_host_mak
+  echo "GCRYPT_CFLAGS=$gcrypt_cflags" >> $config_host_mak
+  echo "GCRYPT_LIBS=$gcrypt_libs" >> $config_host_mak
   if test "$gcrypt_hmac" = "yes" ; then
     echo "CONFIG_GCRYPT_HMAC=y" >> $config_host_mak
   fi
diff --git a/crypto/Makefile.objs b/crypto/Makefile.objs
index 0cb5fa24b6..45f7c0c80d 100644
--- a/crypto/Makefile.objs
+++ b/crypto/Makefile.objs
@@ -34,6 +34,13 @@  crypto-obj-y += block.o
 crypto-obj-y += block-qcow.o
 crypto-obj-y += block-luks.o
 
+$(if $(CONFIG_GCRYPT), \
+	$(foreach x, init cipher hash-gcrypt hmac-gcrypt random-gcrypt \
+			pbkdf-gcrypt, \
+		$(eval $x.o-cflags := $(NETTLE_CFLAGS)) \
+		$(eval $x.o-libs := $(NETTLE_LIBS))) \
+)
+
 $(if $(CONFIG_NETTLE), \
 	$(foreach x, cipher hash-nettle hmac-nettle pbkdf-nettle, \
 		$(eval $x.o-cflags := $(NETTLE_CFLAGS)) \