From nobody Tue Nov 26 22:18:39 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1704012715; cv=none; d=zohomail.com; s=zohoarc; b=OleVGmNcq3PcIuHDFFwsmWZWla3MlcYa+MeIMtvpuMLRtx5J49CqnkNO3c+NEnh1munAzWV5BT8RYFTS/deLVENPGY9rr2bzUBrrCMPFDK3PALzynpN4ZiNUGgYQKpf3XqtG22TjEeoMRIzM257r2Rvuuo8XrWO06dtCohWSIVk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1704012715; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=QLBDwrGEYlc2Syie7CIrGEdhuYzgR0c12m14Bz/+U8c=; b=Hi9IiXeFPFqIOb0SDx/kEfv6uSxfbpEpwTfEzmUapFr/iP9HrgCH9FfPIzkE/FEVkqQBtgrWY4g07pcGZHI42FWWKIUtd6kwJMqQzPwHYO94x+FNInc1ndBqkXmUuRMEFae33JXPhOd7kx5A/Sn+4hT2/gTYuNrek9khcAcli0o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 170401271570539.81895104889452; Sun, 31 Dec 2023 00:51:55 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJrV0-0008KZ-Sm; Sun, 31 Dec 2023 03:48:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rJrT9-0005Ja-AE for qemu-devel@nongnu.org; Sun, 31 Dec 2023 03:46:59 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rJrT0-0000ro-RR for qemu-devel@nongnu.org; Sun, 31 Dec 2023 03:46:50 -0500 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-548-nZHYpfLuOJG4HMMMLBhEyw-1; Sun, 31 Dec 2023 03:46:38 -0500 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-33688a38636so5903775f8f.1 for ; Sun, 31 Dec 2023 00:46:37 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id b13-20020a056000054d00b0033739c1da1dsm1901961wrf.67.2023.12.31.00.46.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 00:46:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1704012402; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QLBDwrGEYlc2Syie7CIrGEdhuYzgR0c12m14Bz/+U8c=; b=G9ImIPOH0l4OxM9QNe+Ljgdf3nckN7Fa0FLWfYRpjCGUzl8oXkA88KMp9zq3Z17LRN9FMN N4jd0VICpivx9JQF8BsuhGgF/KWodhlF/9rjETz2QLoWOArhiidneW6hBkiCC13v7VUXkW JQ3YuwGKspJ+SeYtNUjkjTaPRWalsyk= X-MC-Unique: nZHYpfLuOJG4HMMMLBhEyw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704012396; x=1704617196; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QLBDwrGEYlc2Syie7CIrGEdhuYzgR0c12m14Bz/+U8c=; b=NF0gUIbi79k6Oe9aOfCpcu/YHC9o20miFaRwYWbTT7rmCw0Z+e3pWriJuokRQwzSlu pLtBofCO9HE+9N35HUfTH6F65jPYn9MsmlLbRpQBQsquVPgjbsQuB2wQ1UjUGgE7vNWL TbrUkBNKjpmxvAEmn0vvcCzZ8hYmwykw5rwgCklIkqnN+qT8OIH/ugo/oCJjhbuP2CRG opV1htmccSnBWMhcn1DFxH3/iATxcUFkNf1/46poJC97u4qencvLHrWYc0J1qcsXqD2F RhYUr6G8UJcbpU4g28ae+1xKJ8TKHwGGliClaNh+DXjIkfzzE1fDqYjgkXZaH4uMvpkL K4Rw== X-Gm-Message-State: AOJu0YwOlVIRyk6NHBIsXbzGw4SzpwGEkMtNd3/dxGIiOXBe7fZm1uSA BEKoVoRzGedOrvJsCjmsWVClb7NtyGxu63BlKy40ZLYIQSLhJ8qGMNNmEJNgHDUOvvIj5+j/o89 LOjsj2vtuZy5uu+aZoJAYp3/HdlOYWU5sq+v4+fztUxx/vVfWerTy3ZrpY6/JIyBB/HaZiuGGNz o5/hlFsX4= X-Received: by 2002:a5d:6d87:0:b0:337:3ee4:9436 with SMTP id l7-20020a5d6d87000000b003373ee49436mr184820wrs.76.1704012396714; Sun, 31 Dec 2023 00:46:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IFWRaCNBa/hNhdBkfy7iiTbP1KB0AKcv/wnp07sL7BRUL2/ms7ED9uVAw51mX0ACF8+j2l7Nw== X-Received: by 2002:a5d:6d87:0:b0:337:3ee4:9436 with SMTP id l7-20020a5d6d87000000b003373ee49436mr184813wrs.76.1704012396038; Sun, 31 Dec 2023 00:46:36 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 35/46] meson: keep subprojects together Date: Sun, 31 Dec 2023 09:44:51 +0100 Message-ID: <20231231084502.235366-36-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231231084502.235366-1-pbonzini@redhat.com> References: <20231231084502.235366-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -47 X-Spam_score: -4.8 X-Spam_bar: ---- X-Spam_report: (-4.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.667, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1704012717199100001 Content-Type: text/plain; charset="utf-8" And move away dependencies that are not subprojects anymore. Signed-off-by: Paolo Bonzini --- meson.build | 72 ++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/meson.build b/meson.build index 1867e0428b1..efb36c762e9 100644 --- a/meson.build +++ b/meson.build @@ -1622,6 +1622,25 @@ if not gnutls_crypto.found() endif endif =20 +capstone =3D not_found +if not get_option('capstone').auto() or have_system or have_user + capstone =3D dependency('capstone', version: '>=3D3.0.5', + method: 'pkg-config', + required: get_option('capstone')) + + # Some versions of capstone have broken pkg-config file + # that reports a wrong -I path, causing the #include to + # fail later. If the system has such a broken version + # do not use it. + if capstone.found() and not cc.compiles('#include ', + dependencies: [capstone]) + capstone =3D not_found + if get_option('capstone').enabled() + error('capstone requested, but it does not appear to work') + endif + endif +endif + gmp =3D dependency('gmp', required: false, method: 'pkg-config') if nettle.found() and gmp.found() hogweed =3D dependency('hogweed', version: '>=3D3.4', @@ -2127,6 +2146,7 @@ config_host_data.set('CONFIG_ATTR', libattr.found()) config_host_data.set('CONFIG_BDRV_WHITELIST_TOOLS', get_option('block_drv_= whitelist_in_tools')) config_host_data.set('CONFIG_BRLAPI', brlapi.found()) config_host_data.set('CONFIG_BSD', targetos in bsd_oses) +config_host_data.set('CONFIG_CAPSTONE', capstone.found()) config_host_data.set('CONFIG_COCOA', cocoa.found()) config_host_data.set('CONFIG_DARWIN', targetos =3D=3D 'darwin') config_host_data.set('CONFIG_FUZZ', get_option('fuzzing')) @@ -2190,6 +2210,7 @@ if seccomp.found() config_host_data.set('CONFIG_SECCOMP_SYSRAWRC', seccomp_has_sysrawrc) endif config_host_data.set('CONFIG_PIXMAN', pixman.found()) +config_host_data.set('CONFIG_SLIRP', slirp.found()) config_host_data.set('CONFIG_SNAPPY', snappy.found()) config_host_data.set('CONFIG_SOLARIS', targetos =3D=3D 'sunos') if get_option('tcg').allowed() @@ -3093,28 +3114,9 @@ genh +=3D custom_target('config-poison.h', command: [find_program('scripts/make-config-poison.s= h'), target_configs_h]) =20 -############## -# Submodules # -############## - -capstone =3D not_found -if not get_option('capstone').auto() or have_system or have_user - capstone =3D dependency('capstone', version: '>=3D3.0.5', - method: 'pkg-config', - required: get_option('capstone')) - - # Some versions of capstone have broken pkg-config file - # that reports a wrong -I path, causing the #include to - # fail later. If the system has such a broken version - # do not use it. - if capstone.found() and not cc.compiles('#include ', - dependencies: [capstone]) - capstone =3D not_found - if get_option('capstone').enabled() - error('capstone requested, but it does not appear to work') - endif - endif -endif +############### +# Subprojects # +############### =20 libvfio_user_dep =3D not_found if have_system and vfio_user_server_allowed @@ -3158,9 +3160,19 @@ else fdt_opt =3D 'disabled' endif =20 -config_host_data.set('CONFIG_CAPSTONE', capstone.found()) config_host_data.set('CONFIG_FDT', fdt.found()) -config_host_data.set('CONFIG_SLIRP', slirp.found()) + +vhost_user =3D not_found +if targetos =3D=3D 'linux' and have_vhost_user + libvhost_user =3D subproject('libvhost-user') + vhost_user =3D libvhost_user.get_variable('vhost_user_dep') +endif + +libvduse =3D not_found +if have_libvduse + libvduse_proj =3D subproject('libvduse') + libvduse =3D libvduse_proj.get_variable('libvduse_dep') +endif =20 ##################### # Generated sources # @@ -3391,18 +3403,6 @@ if have_system or have_user ] endif =20 -vhost_user =3D not_found -if targetos =3D=3D 'linux' and have_vhost_user - libvhost_user =3D subproject('libvhost-user') - vhost_user =3D libvhost_user.get_variable('vhost_user_dep') -endif - -libvduse =3D not_found -if have_libvduse - libvduse_proj =3D subproject('libvduse') - libvduse =3D libvduse_proj.get_variable('libvduse_dep') -endif - # NOTE: the trace/ subdirectory needs the qapi_trace_events variable # that is filled in by qapi/. subdir('qapi') --=20 2.43.0