From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39502) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpWaI-0003a4-9S for qemu-devel@nongnu.org; Wed, 06 Sep 2017 05:25:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dpWaD-0003Tf-Sd for qemu-devel@nongnu.org; Wed, 06 Sep 2017 05:25:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60708) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dpWaD-0003TQ-Ly for qemu-devel@nongnu.org; Wed, 06 Sep 2017 05:25:17 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E6646C049E31 for ; Wed, 6 Sep 2017 09:25:15 +0000 (UTC) Date: Wed, 6 Sep 2017 17:25:13 +0800 From: Fam Zheng Message-ID: <20170906092513.GD19537@lemon.lan> References: <20170906074418.10903-1-famz@redhat.com> <20170906074418.10903-4-famz@redhat.com> <20170906085626.GG15510@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170906085626.GG15510@redhat.com> Subject: Re: [Qemu-devel] [PATCH v3 3/3] buildsys: Move gcrypt cflags/libs to per object List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Daniel P. Berrange" Cc: qemu-devel@nongnu.org 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 > > --- > > 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 > > 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 :| >