From nobody Fri Sep 20 22:16:13 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=1598425420; cv=none; d=zohomail.com; s=zohoarc; b=GwfpVUgy3ePjdrqDQ20Mo9avIyjAvqoc19Ku9FMfCalNBdSCbA390sOGPrb4LZag9UYKhCSj/3vsOY6l7HC+PUKdXc1mElM9p3PA3nKhyfPz49F4WbPlVRHy1VU4bnnvZLdU9xOxqgxnjDJZc5gNaU8ZGjK16M7YtMz1NkDOytA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598425420; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=J7gUqpKxXGViqqNujMitirPWY4iVbZt8POe9u7LHEzk=; b=Zu4Efa6bylD7HrQFQlKyQyCU1GO0vVZj0/fBxSPPywKRfdlo2NP4lMT5TYkY6j1ZKQicQ9Dya0rYRYLmt/2IOskSWB2PRGemP2RddZicU80+rFXlQ7A1oIQmY7PINlbq/9iVyQeijT7OnENWyS0mrq2kIafKd7+Il2TPzKrrPwI= 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 1598425420190159.11968041496243; Wed, 26 Aug 2020 00:03:40 -0700 (PDT) Received: from localhost ([::1]:43944 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kApT8-0007G0-Rc for importer@patchew.org; Wed, 26 Aug 2020 03:03:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43758) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kApSP-00062r-Fk for qemu-devel@nongnu.org; Wed, 26 Aug 2020 03:02:53 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:30267) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kApSN-00051h-NU for qemu-devel@nongnu.org; Wed, 26 Aug 2020 03:02:53 -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-66-qeYm0wLROe6jCPRXGi5iew-1; Wed, 26 Aug 2020 03:02:46 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D6FA61005E74; Wed, 26 Aug 2020 07:02:45 +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 89D3610021AA; Wed, 26 Aug 2020 07:02:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598425370; 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; bh=J7gUqpKxXGViqqNujMitirPWY4iVbZt8POe9u7LHEzk=; b=MelNWnhE5d2nCYLQwpuAavhpvqTxWiQnadbW5HZGOaer65z817YD/2SXUaCfAxg2zu3N/r 1a4M5hAcvlz+LlX/Jko6eYvv9bzaClHRCDnujaxuipGNywz6Amb/e0cGZdiOLmI5E6ExYF kT3Y46hq171tvzM/wSjArPgE7NnHpE8= X-MC-Unique: qeYm0wLROe6jCPRXGi5iew-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH] meson: skip SDL2 detection if --disable-system Date: Wed, 26 Aug 2020 03:02:45 -0400 Message-Id: <20200826070245.12051-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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=63.128.21.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/26 02:45:17 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.958, 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_H5=0.001, RCVD_IN_MSPIKE_WL=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 Reviewed-by: Marc-Andr=C3=A9 Lureau --- meson.build | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/meson.build b/meson.build index 57c2fe2b65..19d4d42512 100644 --- a/meson.build +++ b/meson.build @@ -21,6 +21,16 @@ qemu_datadir =3D get_option('datadir') + get_option('con= fsuffix') 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(), @@ -225,9 +235,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', @@ -423,9 +436,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 {} @@ -446,7 +456,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() @@ -469,8 +478,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 @@ -500,8 +507,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