{"id":810353,"url":"http://patchwork.ozlabs.org/api/patches/810353/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170906012715.31761-3-famz@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170906012715.31761-3-famz@redhat.com>","list_archive_url":null,"date":"2017-09-06T01:27:14","name":"[v2,2/3] buildsys: Move gnutls cflags/libs to per object","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"b542aeb079762210046df3747611515bf0f36a5f","submitter":{"id":24872,"url":"http://patchwork.ozlabs.org/api/people/24872/?format=json","name":"Fam Zheng","email":"famz@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170906012715.31761-3-famz@redhat.com/mbox/","series":[{"id":1678,"url":"http://patchwork.ozlabs.org/api/series/1678/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=1678","date":"2017-09-06T01:27:12","name":"buildsys: Move crypto libraries to per object variables","version":2,"mbox":"http://patchwork.ozlabs.org/series/1678/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/810353/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810353/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx10.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx10.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=famz@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xn5Z20nrVz9t3f\n\tfor ;\n\tWed, 6 Sep 2017 11:28:09 +1000 (AEST)","from localhost ([::1]:33734 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dpP8R-0003mG-9E\n\tfor incoming@patchwork.ozlabs.org; Tue, 05 Sep 2017 21:28:07 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:36230)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dpP7k-0003lF-Lf\n\tfor qemu-devel@nongnu.org; Tue, 05 Sep 2017 21:27:25 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dpP7j-00084u-MI\n\tfor qemu-devel@nongnu.org; Tue, 05 Sep 2017 21:27:24 -0400","from mx1.redhat.com ([209.132.183.28]:33836)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dpP7j-00084b-Dz\n\tfor qemu-devel@nongnu.org; Tue, 05 Sep 2017 21:27:23 -0400","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 7EF1F5AFD9\n\tfor ; Wed, 6 Sep 2017 01:27:22 +0000 (UTC)","from lemon.redhat.com (ovpn-12-90.pek2.redhat.com [10.72.12.90])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 3E3AC61345;\n\tWed, 6 Sep 2017 01:27:20 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 7EF1F5AFD9","From":"Fam Zheng ","To":"qemu-devel@nongnu.org","Date":"Wed, 6 Sep 2017 09:27:14 +0800","Message-Id":"<20170906012715.31761-3-famz@redhat.com>","In-Reply-To":"<20170906012715.31761-1-famz@redhat.com>","References":"<20170906012715.31761-1-famz@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.11","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.39]);\n\tWed, 06 Sep 2017 01:27:22 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH v2 2/3] buildsys: Move gnutls cflags/libs to\n\tper object","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Signed-off-by: Fam Zheng \n---\n configure | 4 ++--\n crypto/Makefile.objs | 7 +++++++\n tests/Makefile.include | 10 +++++-----\n 3 files changed, 14 insertions(+), 7 deletions(-)","diff":"diff --git a/configure b/configure\nindex 6a4cb3832b..d24a7eab37 100755\n--- a/configure\n+++ b/configure\n@@ -2472,8 +2472,6 @@ if test \"$gnutls\" != \"no\"; then\n if gnutls_works; then\n gnutls_cflags=$($pkg_config --cflags gnutls)\n gnutls_libs=$($pkg_config --libs gnutls)\n- libs_softmmu=\"$gnutls_libs $libs_softmmu\"\n- libs_tools=\"$gnutls_libs $libs_tools\"\n \tQEMU_CFLAGS=\"$QEMU_CFLAGS $gnutls_cflags\"\n gnutls=\"yes\"\n \n@@ -5710,6 +5708,8 @@ fi\n echo \"CONFIG_TLS_PRIORITY=\\\"$tls_priority\\\"\" >> $config_host_mak\n if test \"$gnutls\" = \"yes\" ; then\n echo \"CONFIG_GNUTLS=y\" >> $config_host_mak\n+ echo \"GNUTLS_CFLAGS=$gnutls_cflags\" >> $config_host_mak\n+ echo \"GNUTLS_LIBS=$gnutls_libs\" >> $config_host_mak\n fi\n if test \"$gnutls_rnd\" = \"yes\" ; then\n echo \"CONFIG_GNUTLS_RND=y\" >> $config_host_mak\ndiff --git a/crypto/Makefile.objs b/crypto/Makefile.objs\nindex a936957d03..0cb5fa24b6 100644\n--- a/crypto/Makefile.objs\n+++ b/crypto/Makefile.objs\n@@ -40,6 +40,13 @@ $(if $(CONFIG_NETTLE), \\\n \t\t$(eval $x.o-libs := $(NETTLE_LIBS))) \\\n )\n \n+$(if $(CONFIG_GNUTLS), \\\n+\t$(foreach x, init random-gnutls tlscreds tlscredsanon \\\n+\t\t\ttlscredsx509 tlssession, \\\n+\t\t$(eval $x.o-cflags := $(GNUTLS_CFLAGS)) \\\n+\t\t$(eval $x.o-libs := $(GNUTLS_LIBS))) \\\n+)\n+\n # Let the userspace emulators avoid linking gnutls/etc\n crypto-aes-obj-y = aes.o\n \ndiff --git a/tests/Makefile.include b/tests/Makefile.include\nindex fae5715e9c..d46c22d1ec 100644\n--- a/tests/Makefile.include\n+++ b/tests/Makefile.include\n@@ -677,15 +677,15 @@ tests/benchmark-crypto-cipher$(EXESUF): tests/benchmark-crypto-cipher.o $(test-c\n tests/test-crypto-secret$(EXESUF): tests/test-crypto-secret.o $(test-crypto-obj-y)\n tests/test-crypto-xts$(EXESUF): tests/test-crypto-xts.o $(test-crypto-obj-y)\n \n-tests/crypto-tls-x509-helpers.o-cflags := $(TASN1_CFLAGS)\n-tests/crypto-tls-x509-helpers.o-libs := $(TASN1_LIBS)\n-tests/pkix_asn1_tab.o-cflags := $(TASN1_CFLAGS)\n+tests/crypto-tls-x509-helpers.o-cflags := $(TASN1_CFLAGS) $(GNUTLS_CFLAGS)\n+tests/crypto-tls-x509-helpers.o-libs := $(TASN1_LIBS) $(GNUTLS_LIBS)\n+tests/pkix_asn1_tab.o-cflags := $(TASN1_CFLAGS) $(GNUTLS_LIBS)\n \n-tests/test-crypto-tlscredsx509.o-cflags := $(TASN1_CFLAGS)\n+tests/test-crypto-tlscredsx509.o-cflags := $(TASN1_CFLAGS) $(GNUTLS_CFLAGS)\n tests/test-crypto-tlscredsx509$(EXESUF): tests/test-crypto-tlscredsx509.o \\\n \ttests/crypto-tls-x509-helpers.o tests/pkix_asn1_tab.o $(test-crypto-obj-y)\n \n-tests/test-crypto-tlssession.o-cflags := $(TASN1_CFLAGS)\n+tests/test-crypto-tlssession.o-cflags := $(TASN1_CFLAGS) $(GNUTLS_CFLAGS)\n tests/test-crypto-tlssession$(EXESUF): tests/test-crypto-tlssession.o \\\n \ttests/crypto-tls-x509-helpers.o tests/pkix_asn1_tab.o $(test-crypto-obj-y)\n tests/test-io-task$(EXESUF): tests/test-io-task.o $(test-io-obj-y)\n","prefixes":["v2","2/3"]}