From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41417) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpWfd-0004cy-7V for qemu-devel@nongnu.org; Wed, 06 Sep 2017 05:30:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dpWfZ-0005mi-7l for qemu-devel@nongnu.org; Wed, 06 Sep 2017 05:30:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36296) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dpWfZ-0005mQ-1F for qemu-devel@nongnu.org; Wed, 06 Sep 2017 05:30:49 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C10A920272 for ; Wed, 6 Sep 2017 09:30:47 +0000 (UTC) Date: Wed, 6 Sep 2017 17:30:45 +0800 From: Fam Zheng Message-ID: <20170906093045.GE19537@lemon.lan> References: <20170906074418.10903-1-famz@redhat.com> <20170906074418.10903-2-famz@redhat.com> <20170906085533.GE15510@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170906085533.GE15510@redhat.com> Subject: Re: [Qemu-devel] [PATCH v3 1/3] buildsys: Move nettle 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:55, Daniel P. Berrange wrote: > On Wed, Sep 06, 2017 at 03:44:16PM +0800, Fam Zheng wrote: > > Signed-off-by: Fam Zheng > > --- > > configure | 5 ++--- > > crypto/Makefile.objs | 6 ++++++ > > 2 files changed, 8 insertions(+), 3 deletions(-) > > > > diff --git a/configure b/configure > > index fb7e34a901..6a4cb3832b 100755 > > --- a/configure > > +++ b/configure > > @@ -2616,9 +2616,6 @@ if test "$nettle" != "no"; then > > nettle_cflags=$($pkg_config --cflags nettle) > > nettle_libs=$($pkg_config --libs nettle) > > nettle_version=$($pkg_config --modversion nettle) > > - libs_softmmu="$nettle_libs $libs_softmmu" > > - libs_tools="$nettle_libs $libs_tools" > > - QEMU_CFLAGS="$QEMU_CFLAGS $nettle_cflags" > > nettle="yes" > > > > cat > $TMPC << EOF > > @@ -5732,6 +5729,8 @@ if test "$nettle" = "yes" ; then > > if test "$nettle_kdf" = "yes" ; then > > echo "CONFIG_NETTLE_KDF=y" >> $config_host_mak > > fi > > + echo "NETTLE_CFLAGS=$nettle_cflags" >> $config_host_mak > > + echo "NETTLE_LIBS=$nettle_libs" >> $config_host_mak > > fi > > if test "$tasn1" = "yes" ; then > > echo "CONFIG_TASN1=y" >> $config_host_mak > > diff --git a/crypto/Makefile.objs b/crypto/Makefile.objs > > index 2b99e08062..a936957d03 100644 > > --- a/crypto/Makefile.objs > > +++ b/crypto/Makefile.objs > > @@ -34,6 +34,12 @@ crypto-obj-y += block.o > > crypto-obj-y += block-qcow.o > > crypto-obj-y += block-luks.o > > > > +$(if $(CONFIG_NETTLE), \ > > + $(foreach x, cipher hash-nettle hmac-nettle pbkdf-nettle, \ > > + $(eval $x.o-cflags := $(NETTLE_CFLAGS)) \ > > + $(eval $x.o-libs := $(NETTLE_LIBS))) \ > > +) > > This is a bit ugly, but i don't see any obvious alternative that > would work Since I screwed up the gcrypt patch, v4 is needed, I'll try to make it less ugly (no foreach and eval). Fam > > > + > > # Let the userspace emulators avoid linking gnutls/etc > > crypto-aes-obj-y = aes.o > > 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 :| >