From nobody Sun Nov 16 05:42:12 2025 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=1598548411; cv=none; d=zohomail.com; s=zohoarc; b=lOOu+d9oVKPxEYiMXS3VFXHWpa9R++C7EZym6+/gznjNki+PRH+PVtu9h6MWY97ECsaxeDueqsxFFqpXQunWKlsGpd40LXJxEIlXIgXbsIyW8eJLrWASUyLAydV8UZ+PNgeQ/89DCCVqEv99GVVHaSAn4wgqzfm/DMHo+xG7xYI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598548411; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0GIS4sJrpYwSxVl4OBe0grTnM0NESHgzmK3QC9d6C6k=; b=HjcgsaKAEUSnifgGmridQY2xhLIreZX7kEG6sZyoRn3RV8NGjlC8h92ZdA+WQTpX1PtFnXmWSVjdp1qkBoqaTs7DfL2vqLhuL5idgY7mzp/100AAv9PM/eh3/ATh2aBk8JvkR2zSCtoYj5FgQ9h/tRC/gB+Q4yG4OqYq4vGFUgU= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598548411620556.3345432183828; Thu, 27 Aug 2020 10:13:31 -0700 (PDT) Received: from localhost ([::1]:55738 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBLSs-0001SI-8I for importer@patchew.org; Thu, 27 Aug 2020 13:13:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50902) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBLGF-0006EU-Dh for qemu-devel@nongnu.org; Thu, 27 Aug 2020 13:00:27 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:21514 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBLGB-0005R0-3K for qemu-devel@nongnu.org; Thu, 27 Aug 2020 13:00:27 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-558-9hIK1qE8PH2DAu-RBAoawg-1; Thu, 27 Aug 2020 13:00:20 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 92F09800683; Thu, 27 Aug 2020 17:00:19 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3FD7D50B3F; Thu, 27 Aug 2020 17:00:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598547622; 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=0GIS4sJrpYwSxVl4OBe0grTnM0NESHgzmK3QC9d6C6k=; b=Ihjjv1xsq17BaQfXHVO19xff2aFUtBGlU71omy3UwaJ4j1JA/cBt9l4N0MixzQbAn/6XFt 8k0d1jYIdL1a+9bMzId6gdZxyg3/yyBaLbhp5IDoJ2LmQah9qrTlpTQfxm6PZLzENCeNVu 2xafNXzTrUh3v4JjN6p3AI6z838llsE= X-MC-Unique: 9hIK1qE8PH2DAu-RBAoawg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 09/17] meson: skip SDL2 detection if --disable-system Date: Thu, 27 Aug 2020 12:59:48 -0400 Message-Id: <20200827165956.12925-10-pbonzini@redhat.com> In-Reply-To: <20200827165956.12925-1-pbonzini@redhat.com> References: <20200827165956.12925-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com 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=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 00:13:19 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" SDL is only used for system emulation; avoid spurious warnings for static --disable-system emulation by skipping the detection of the library if there are no system emulation targets. Reported-by: Peter Maydell Signed-off-by: Paolo Bonzini --- meson.build | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/meson.build b/meson.build index 86a6d13192..a3baa2dbf0 100644 --- a/meson.build +++ b/meson.build @@ -20,6 +20,16 @@ build_docs =3D 'BUILD_DOCS' in config_host config_host_data =3D configuration_data() genh =3D [] =20 +target_dirs =3D config_host['TARGET_DIRS'].split() +have_user =3D false +have_system =3D false +foreach target : target_dirs + have_user =3D have_user or target.endswith('-user') + have_system =3D have_system or target.endswith('-softmmu') +endforeach +have_tools =3D 'CONFIG_TOOLS' in config_host +have_block =3D have_system or have_tools + add_project_arguments(config_host['QEMU_CFLAGS'].split(), native: false, language: ['c', 'objc']) add_project_arguments(config_host['QEMU_CXXFLAGS'].split(), @@ -227,9 +237,12 @@ if 'CONFIG_BRLAPI' in config_host brlapi =3D declare_dependency(link_args: config_host['BRLAPI_LIBS'].spli= t()) endif =20 -sdl =3D dependency('sdl2', required: get_option('sdl'), static: enable_sta= tic, - include_type: 'system') -sdl_image =3D not_found +sdl =3D not_found +if have_system + sdl =3D dependency('sdl2', required: get_option('sdl'), static: enable_s= tatic, + include_type: 'system') + sdl_image =3D not_found +endif if sdl.found() # work around 2.0.8 bug sdl =3D declare_dependency(compile_args: '-Wno-undef', @@ -426,9 +439,6 @@ endforeach genh +=3D configure_file(output: 'config-host.h', configuration: config_ho= st_data) =20 minikconf =3D find_program('scripts/minikconf.py') -target_dirs =3D config_host['TARGET_DIRS'].split() -have_user =3D false -have_system =3D false config_devices_mak_list =3D [] config_devices_h =3D {} config_target_h =3D {} @@ -449,7 +459,6 @@ kconfig_external_symbols =3D [ ] ignored =3D ['TARGET_XML_FILES', 'TARGET_ABI_DIR', 'TARGET_DIRS'] foreach target : target_dirs - have_user =3D have_user or target.endswith('-user') config_target =3D keyval.load(meson.current_build_dir() / target / 'conf= ig-target.mak') =20 config_target_data =3D configuration_data() @@ -472,8 +481,6 @@ foreach target : target_dirs configuration: config_targe= t_data)} =20 if target.endswith('-softmmu') - have_system =3D true - base_kconfig =3D [] foreach sym : kconfig_external_symbols if sym in config_target or sym in config_host @@ -503,8 +510,6 @@ foreach target : target_dirs endif config_target_mak +=3D {target: config_target} endforeach -have_tools =3D 'CONFIG_TOOLS' in config_host -have_block =3D have_system or have_tools =20 grepy =3D find_program('scripts/grepy.sh') # This configuration is used to build files that are shared by --=20 2.26.2