From nobody Thu May 2 00:59:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1504624506868630.1514022713284; Tue, 5 Sep 2017 08:15:06 -0700 (PDT) Received: from localhost ([::1]:59578 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpFZB-0006Nj-Oa for importer@patchew.org; Tue, 05 Sep 2017 11:15:05 -0400 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) Received: from lemon.redhat.com (ovpn-12-97.pek2.redhat.com [10.72.12.97]) by smtp.corp.redhat.com (Postfix) with ESMTP id C5ABE7FFC3; Tue, 5 Sep 2017 15:13:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 138A52CB7 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=famz@redhat.com From: Fam Zheng To: qemu-devel@nongnu.org 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> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 05 Sep 2017 15:13:27 +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 1/2] buildsys: Move nettle 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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" !=3D "no"; then nettle_cflags=3D$($pkg_config --cflags nettle) nettle_libs=3D$($pkg_config --libs nettle) nettle_version=3D$($pkg_config --modversion nettle) - libs_softmmu=3D"$nettle_libs $libs_softmmu" - libs_tools=3D"$nettle_libs $libs_tools" - QEMU_CFLAGS=3D"$QEMU_CFLAGS $nettle_cflags" nettle=3D"yes" =20 cat > $TMPC << EOF @@ -5732,6 +5729,8 @@ if test "$nettle" =3D "yes" ; then if test "$nettle_kdf" =3D "yes" ; then echo "CONFIG_NETTLE_KDF=3Dy" >> $config_host_mak fi + echo "NETTLE_CFLAGS=3D$nettle_cflags" >> $config_host_mak + echo "NETTLE_LIBS=3D$nettle_libs" >> $config_host_mak fi if test "$tasn1" =3D "yes" ; then echo "CONFIG_TASN1=3Dy" >> $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 +=3D block.o crypto-obj-y +=3D block-qcow.o crypto-obj-y +=3D block-luks.o =20 +$(if $(CONFIG_NETTLE), \ + $(foreach x, cipher hash-nettle hmac-nettle pbkdf-nettle, \ + $(eval $x.o-cflags :=3D $(NETTLE_CFLAGS)) \ + $(eval $x.o-libs :=3D $(NETTLE_LIBS))) \ +) + # Let the userspace emulators avoid linking gnutls/etc crypto-aes-obj-y =3D aes.o =20 --=20 2.13.5 From nobody Thu May 2 00:59:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1504624600161279.9066757076994; Tue, 5 Sep 2017 08:16:40 -0700 (PDT) Received: from localhost ([::1]:59586 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpFah-00082F-7d for importer@patchew.org; Tue, 05 Sep 2017 11:16:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41060) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpFXl-0005TH-T4 for qemu-devel@nongnu.org; Tue, 05 Sep 2017 11:13:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dpFXe-0000Ur-1V for qemu-devel@nongnu.org; Tue, 05 Sep 2017 11:13:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57376) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dpFXd-0000UX-Pi for qemu-devel@nongnu.org; Tue, 05 Sep 2017 11:13:29 -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 DFECE8F50F for ; Tue, 5 Sep 2017 15:13:28 +0000 (UTC) Received: from lemon.redhat.com (ovpn-12-97.pek2.redhat.com [10.72.12.97]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9F29B7FFCD; Tue, 5 Sep 2017 15:13:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com DFECE8F50F 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 From: Fam Zheng To: qemu-devel@nongnu.org Date: Tue, 5 Sep 2017 23:13:19 +0800 Message-Id: <20170905151319.10756-3-famz@redhat.com> In-Reply-To: <20170905151319.10756-1-famz@redhat.com> References: <20170905151319.10756-1-famz@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Tue, 05 Sep 2017 15:13: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 2/2] buildsys: Move gnutls 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Fam Zheng --- configure | 4 ++-- crypto/Makefile.objs | 7 +++++++ tests/Makefile.include | 10 +++++----- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 6a4cb3832b..d24a7eab37 100755 --- a/configure +++ b/configure @@ -2472,8 +2472,6 @@ if test "$gnutls" !=3D "no"; then if gnutls_works; then gnutls_cflags=3D$($pkg_config --cflags gnutls) gnutls_libs=3D$($pkg_config --libs gnutls) - libs_softmmu=3D"$gnutls_libs $libs_softmmu" - libs_tools=3D"$gnutls_libs $libs_tools" QEMU_CFLAGS=3D"$QEMU_CFLAGS $gnutls_cflags" gnutls=3D"yes" =20 @@ -5710,6 +5708,8 @@ fi echo "CONFIG_TLS_PRIORITY=3D\"$tls_priority\"" >> $config_host_mak if test "$gnutls" =3D "yes" ; then echo "CONFIG_GNUTLS=3Dy" >> $config_host_mak + echo "GNUTLS_CFLAGS=3D$gnutls_cflags" >> $config_host_mak + echo "GNUTLS_LIBS=3D$gnutls_libs" >> $config_host_mak fi if test "$gnutls_rnd" =3D "yes" ; then echo "CONFIG_GNUTLS_RND=3Dy" >> $config_host_mak diff --git a/crypto/Makefile.objs b/crypto/Makefile.objs index a936957d03..0cb5fa24b6 100644 --- a/crypto/Makefile.objs +++ b/crypto/Makefile.objs @@ -40,6 +40,13 @@ $(if $(CONFIG_NETTLE), \ $(eval $x.o-libs :=3D $(NETTLE_LIBS))) \ ) =20 +$(if $(CONFIG_GNUTLS), \ + $(foreach x, init random-gnutls tlscreds tlscredsanon \ + tlscredsx509 tlssession, \ + $(eval $x.o-cflags :=3D $(GNUTLS_CFLAGS)) \ + $(eval $x.o-libs :=3D $(GNUTLS_LIBS))) \ +) + # Let the userspace emulators avoid linking gnutls/etc crypto-aes-obj-y =3D aes.o =20 diff --git a/tests/Makefile.include b/tests/Makefile.include index fae5715e9c..d46c22d1ec 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -677,15 +677,15 @@ tests/benchmark-crypto-cipher$(EXESUF): tests/benchma= rk-crypto-cipher.o $(test-c tests/test-crypto-secret$(EXESUF): tests/test-crypto-secret.o $(test-crypt= o-obj-y) tests/test-crypto-xts$(EXESUF): tests/test-crypto-xts.o $(test-crypto-obj-= y) =20 -tests/crypto-tls-x509-helpers.o-cflags :=3D $(TASN1_CFLAGS) -tests/crypto-tls-x509-helpers.o-libs :=3D $(TASN1_LIBS) -tests/pkix_asn1_tab.o-cflags :=3D $(TASN1_CFLAGS) +tests/crypto-tls-x509-helpers.o-cflags :=3D $(TASN1_CFLAGS) $(GNUTLS_CFLAG= S) +tests/crypto-tls-x509-helpers.o-libs :=3D $(TASN1_LIBS) $(GNUTLS_LIBS) +tests/pkix_asn1_tab.o-cflags :=3D $(TASN1_CFLAGS) $(GNUTLS_LIBS) =20 -tests/test-crypto-tlscredsx509.o-cflags :=3D $(TASN1_CFLAGS) +tests/test-crypto-tlscredsx509.o-cflags :=3D $(TASN1_CFLAGS) $(GNUTLS_CFLA= GS) tests/test-crypto-tlscredsx509$(EXESUF): tests/test-crypto-tlscredsx509.o \ tests/crypto-tls-x509-helpers.o tests/pkix_asn1_tab.o $(test-crypto-obj-y) =20 -tests/test-crypto-tlssession.o-cflags :=3D $(TASN1_CFLAGS) +tests/test-crypto-tlssession.o-cflags :=3D $(TASN1_CFLAGS) $(GNUTLS_CFLAGS) tests/test-crypto-tlssession$(EXESUF): tests/test-crypto-tlssession.o \ tests/crypto-tls-x509-helpers.o tests/pkix_asn1_tab.o $(test-crypto-obj-y) tests/test-io-task$(EXESUF): tests/test-io-task.o $(test-io-obj-y) --=20 2.13.5