From nobody Sat Oct 4 20:33:20 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1601989008; cv=none; d=zohomail.com; s=zohoarc; b=E5rWlPLFbm35IyH3VHlBLFSc1gRy5fFYljHB2zm87IqVfGOvxp+xNyA4qgQvz+B8bHzXsve+n/NN7AFbxRF3nP0tXqS5FCltNWLnRAhHGUTJOSIuiXoufLKGzjeDEuLmB736jm/Y35+o6DRou3S4hAaRi/BLEJ+gHqOWBhN85EY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601989008; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=XTtKHQhxHEaBS5luua2HAb5gxNyfeWuRj6nkxOmCXlg=; b=Iznfq/1oeX1gSfyjLk09rDWq8XC2o5wjtCauoaxBWbSb4/fDu3WmA7ROrYn/jsmqXrZ8l4Kerax5DLvK+MuAtsQDrGXWwTaYjLpSK/eU4/COTBx35ArNY/DY+dhi3HPxAT80Xvpdvxjgudu0MK0K+6N4BcRRo6IK6a9/13wCfhU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1601989008711798.3568816336522; Tue, 6 Oct 2020 05:56:48 -0700 (PDT) Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-349-IBSGVvCZOXOWsngqrpVapw-1; Tue, 06 Oct 2020 08:56:43 -0400 Received: by mail-wr1-f72.google.com with SMTP id v12so5325459wrm.9 for ; Tue, 06 Oct 2020 05:56:41 -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 z11sm4404934wru.88.2020.10.06.05.56.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 05:56:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601989007; 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=XTtKHQhxHEaBS5luua2HAb5gxNyfeWuRj6nkxOmCXlg=; b=gYu643RKqolWllmnNuAOEQjDusRdzkM4USS10Hwr/z8LCdq4EKXPGnMUPRb4dJocLFNtEz 5vfevNJdMF4Q7FaTc0o1cV7RmJwJH08W/+vpNdpHGX8Es2O2anjalZC+cp7BK5FCjBgqLA uL6dsfTQ2e43Jas9IrTa0CRIFA+blMw= X-MC-Unique: IBSGVvCZOXOWsngqrpVapw-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=XTtKHQhxHEaBS5luua2HAb5gxNyfeWuRj6nkxOmCXlg=; b=BblfpVMuay2/pf2ani6anJ+YWReGxZLS7ed060FfwH3lyF1prFVFNwrNCJYmMpufpF NagXq4z0QqbpzSKuR2vSq+IITg/TH/YS/TSGJDrinR3MR6rsiZS1xYfavSfKdZqvhD65 +NxVbcwNZ6RRAb05W2kUQbnO9UUPlS6dLiK2jAszQZdScCWREM4fsANZDz2LeBzqNFFT eqZoJPdrU3PtSj1FzVJbnzm6yYQWhwgu6N2LT/RZYE57AQkeSZJrK9eHpHoZ9QVvfv69 uj9tUY8bB4/m4Jh377GCtC26VSpx/Q9wbQyDXvXTxkWK6pE6XviUsjtiNEUkLxjRGqrY S86g== X-Gm-Message-State: AOAM531J3XR8gbjpSlrvg17ZejoNy9aOFkaM53p/AUvG51YqNhAM/X0K OApuj4l7IDG46szYloIPZ2rgA/DqJ/R7ZJY3peEmEmtsmRpbhB7fLulZvUvQaI5jB6hSYa3KSsN pxzZYbGifODcPkQ== X-Received: by 2002:adf:a345:: with SMTP id d5mr2707718wrb.55.1601989000438; Tue, 06 Oct 2020 05:56:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxX8/rtlX/9R/0HtvfRUKeDnzH58wOuyHOuu7MluYltgob8IsSHLO2hsQPA0GvmKTfLk9T4Jw== X-Received: by 2002:adf:a345:: with SMTP id d5mr2707702wrb.55.1601989000248; Tue, 06 Oct 2020 05:56:40 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , Juan Quintela , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 7/9] crypto: Move the creation of the library to the main meson.build Date: Tue, 6 Oct 2020 14:56:00 +0200 Message-Id: <20201006125602.2311423-8-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201006125602.2311423-1-philmd@redhat.com> References: <20201006125602.2311423-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 f9d952d685..d064d07dae 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