From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41032) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpFXg-0005S8-PY for qemu-devel@nongnu.org; Tue, 05 Sep 2017 11:13:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dpFXc-0000Tl-4b for qemu-devel@nongnu.org; Tue, 05 Sep 2017 11:13:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48368) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dpFXb-0000TL-Um for qemu-devel@nongnu.org; Tue, 05 Sep 2017 11:13:28 -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 138A52CB7 for ; Tue, 5 Sep 2017 15:13:27 +0000 (UTC) From: Fam Zheng Date: Tue, 5 Sep 2017 23:13:18 +0800 Message-Id: <20170905151319.10756-2-famz@redhat.com> In-Reply-To: <20170905151319.10756-1-famz@redhat.com> References: <20170905151319.10756-1-famz@redhat.com> Subject: [Qemu-devel] [PATCH 1/2] buildsys: Move nettle cflags/libs to per object List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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))) \ +) + # Let the userspace emulators avoid linking gnutls/etc crypto-aes-obj-y = aes.o -- 2.13.5