From patchwork Wed Sep 6 07:44:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 810422 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xnFys2Q0qz9sNd for ; Wed, 6 Sep 2017 17:46:45 +1000 (AEST) Received: from localhost ([::1]:34634 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpV2p-00061I-FL for incoming@patchwork.ozlabs.org; Wed, 06 Sep 2017 03:46:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58378) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpV0h-0004q7-SB for qemu-devel@nongnu.org; Wed, 06 Sep 2017 03:44:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dpV0h-0004QY-1P for qemu-devel@nongnu.org; Wed, 06 Sep 2017 03:44:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49178) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dpV0g-0004QF-Ru for qemu-devel@nongnu.org; Wed, 06 Sep 2017 03:44:30 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B6D3785543 for ; Wed, 6 Sep 2017 07:44:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com B6D3785543 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=famz@redhat.com Received: from lemon.redhat.com (ovpn-12-90.pek2.redhat.com [10.72.12.90]) by smtp.corp.redhat.com (Postfix) with ESMTP id 42CF46FAAB; Wed, 6 Sep 2017 07:44:27 +0000 (UTC) From: Fam Zheng To: qemu-devel@nongnu.org Date: Wed, 6 Sep 2017 15:44:18 +0800 Message-Id: <20170906074418.10903-4-famz@redhat.com> In-Reply-To: <20170906074418.10903-1-famz@redhat.com> References: <20170906074418.10903-1-famz@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 06 Sep 2017 07:44:29 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 3/3] buildsys: Move gcrypt cflags/libs to per object X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Fam Zheng Reviewed-by: Daniel P. Berrange --- 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)) \