From nobody Sun Nov 16 23:02:11 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1601982785; cv=none; d=zohomail.com; s=zohoarc; b=Sy89w9cXZMocMfE76H3AwFB5XvihgAxRjjZkeXfWETKweCPtC7jjlMrSCxY88yzoVpYI36WGuqzegFAHCJhtwiel5J157yfgrRBsgOrWLfnJOal9sHuOv8vkES/Vni3SC5H9I4r1TSPL/ikkyLjKzazs1aPBYvQHTaTn1a1Oh2c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601982785; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=y654+qjr2XVjaJo/qs42m3q3chS6kyMAnJkYOWqEyzg=; b=K9GuMhVvfokBpyo8nVaL5aqlBS1wE+kxcTu7SCxhz8RVB5Mg1um+OqJOg62TvoSVwj1rq/VBJRWpdShp5fG9KIFOWZeoYsXm8vsCbOzLJNKPDjSauxLQeYElxdca7IdjjEjl5J9P6sas2zHVGc0TgT04zYMKgWFcXw6Bb2m7nDQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1601982785413473.4426838512326; Tue, 6 Oct 2020 04:13:05 -0700 (PDT) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-484-6AbNKjEIMg6uBvr4_-81Fw-1; Tue, 06 Oct 2020 07:13:02 -0400 Received: by mail-wr1-f69.google.com with SMTP id f11so3017007wro.15 for ; Tue, 06 Oct 2020 04:13:02 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (106.red-83-59-162.dynamicip.rima-tde.net. [83.59.162.106]) by smtp.gmail.com with ESMTPSA id a5sm4028173wrp.37.2020.10.06.04.13.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 04:13:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601982784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=y654+qjr2XVjaJo/qs42m3q3chS6kyMAnJkYOWqEyzg=; b=X/w3cQ1HqWemS782GKMwdBX/Fkeh3g48SAKkf1rUrPajXKgNGsz0GwuvCawwg2d1IEitJl 0ljULRvUG9Duud5k642IHfzkq7CEFoqbKJnWLW1/j98zRbA2gOYA7QKRgOyhb+pOLRaiR/ zb9Zc9IXOe6Z4NofQvuiqzosWrTJv8E= X-MC-Unique: 6AbNKjEIMg6uBvr4_-81Fw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=y654+qjr2XVjaJo/qs42m3q3chS6kyMAnJkYOWqEyzg=; b=j45ULPQ93sDrmDQvF2XVPB527WNqnCVD8PJbju/Fl/qav6DAPlPPS9nVnjJlgMZOrC sIynMuWSAsO4KTNAwa372RBP8Vd2Jhg7TNPz6RNJz5i+VGp0dxJubgTCLya7XMIb0pmd JRhI9OVFFl+5GEhlZP7b3lNuVwmOKo4CrL/mFO0zsMXNbqLO+dxfTJBM8OuzFuuxJY4t XwOggVKVpAIW55VMIhbbA21W8Dq1AhmoJH0iEdJkAmOb6cHCFaGPAGNteuoxvCCNjSdY WrHJby36D/1hb9tiwEmgkbextPOddcMNvmfn+po8nZN45ccywTSOonqIL11kYEbD4CV3 Eq8w== X-Gm-Message-State: AOAM530nR6KrYdHvY0cSZqq3Go/O/mcm0cWZeXVQ+O8LQcY4eWDGwDEv lidr5tL+Wf5qPFhrS+7svewGPvCxzUcXPjnbH1mjATDHdrZVLGjIcgC87wv3LhTgUQQfC8Iugln S1euXbE4/M9jz9Q== X-Received: by 2002:a1c:7f14:: with SMTP id a20mr4298710wmd.95.1601982781453; Tue, 06 Oct 2020 04:13:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy+OHvtXrF4Cdv6W1e4q+LU5p8CBAVEgIZFh+mebr1bYRGoqWf7HScC+Fo6CvAOizEo66Y1Yg== X-Received: by 2002:a1c:7f14:: with SMTP id a20mr4298690wmd.95.1601982781233; Tue, 06 Oct 2020 04:13:01 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Juan Quintela , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 08/10] crypto: Move the creation of the library to the main meson.build Date: Tue, 6 Oct 2020 13:12:17 +0200 Message-Id: <20201006111219.2300921-9-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201006111219.2300921-1-philmd@redhat.com> References: <20201006111219.2300921-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Be consistent creating all the libraries in the main meson.build file. Suggested-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- meson.build | 10 ++++++++++ crypto/meson.build | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/meson.build b/meson.build index 70545efd74..5ded67cb76 100644 --- a/meson.build +++ b/meson.build @@ -1064,6 +1064,7 @@ block_ss =3D ss.source_set() bsd_user_ss =3D ss.source_set() chardev_ss =3D ss.source_set() common_ss =3D ss.source_set() +crypto_ss =3D ss.source_set() io_ss =3D ss.source_set() linux_user_ss =3D ss.source_set() qmp_ss =3D ss.source_set() @@ -1329,6 +1330,15 @@ qemu_syms =3D custom_target('qemu.syms', output: 'qe= mu.syms', # Library dependencies # ######################## =20 +crypto_ss =3D crypto_ss.apply(config_host, strict: false) +libcrypto =3D static_library('crypto', crypto_ss.sources() + genh, + dependencies: [crypto_ss.dependencies()], + name_suffix: 'fa', + build_by_default: false) + +crypto =3D declare_dependency(link_whole: libcrypto, + dependencies: [authz, qom]) + io_ss =3D io_ss.apply(config_host, strict: false) libio =3D static_library('io', io_ss.sources() + genh, dependencies: [io_ss.dependencies()], diff --git a/crypto/meson.build b/crypto/meson.build index f6f5ce1ecd..7f37b5d335 100644 --- a/crypto/meson.build +++ b/crypto/meson.build @@ -1,4 +1,3 @@ -crypto_ss =3D ss.source_set() crypto_ss.add(genh) crypto_ss.add(files( 'afsplit.c', @@ -52,15 +51,6 @@ if 'CONFIG_GNUTLS' in config_host endif =20 =20 -crypto_ss =3D crypto_ss.apply(config_host, strict: false) -libcrypto =3D static_library('crypto', crypto_ss.sources() + genh, - dependencies: [crypto_ss.dependencies()], - name_suffix: 'fa', - build_by_default: false) - -crypto =3D declare_dependency(link_whole: libcrypto, - dependencies: [authz, qom]) - util_ss.add(files('aes.c')) util_ss.add(files('init.c')) =20 --=20 2.26.2