From nobody Thu Sep 19 01:16:20 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1709676656; cv=none; d=zohomail.com; s=zohoarc; b=kpyGZbNpYNzgsCf8LTLIyPcthHTwl1F+edUA3lW8zHbx5jCPLPW9yWELxM2FtEgPzOQweLaY1f/lMdpV6T1UYIvdmcmJybD+hQyPa2vWdOSm+Mobx7RXMkER6EPKTrMckIigL3sqzFEbEURrFYVLgFp9dZSrKuadWyJBRZN97H8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1709676656; h=Content-Type:Content-Transfer-Encoding:Cc:Cc: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; bh=iIAUoqwZw8jjQEXl/6GyiIUaJ3twVU9qfT6FoSeBtUo=; b=ZOPiq5AQ0YR9AhuoMAsgPqNnlwiiVFzvE26qnVh5ssOgSIMG0vouMYaO5Hzjm9sQR7fT+iEKWBL5nM9O3iwF5JymXt2zKJQtCqP7ryhE5M84iLsF1CzfayBL3g0cnUeTJc78Jf7v5K7Zr5rd/TWRWxSVYxUBmm2YT5SVwBoWsfw= 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 17096766569350.31793989178186166; Tue, 5 Mar 2024 14:10:56 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rhcyx-0007AV-J4; Tue, 05 Mar 2024 17:09:55 -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 1rhcyw-00079r-7K for qemu-devel@nongnu.org; Tue, 05 Mar 2024 17:09:54 -0500 Received: from mail-ua1-x935.google.com ([2607:f8b0:4864:20::935]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rhcyu-0000jj-Nw for qemu-devel@nongnu.org; Tue, 05 Mar 2024 17:09:53 -0500 Received: by mail-ua1-x935.google.com with SMTP id a1e0cc1a2514c-7d698a8d93cso3517681241.3 for ; Tue, 05 Mar 2024 14:09:52 -0800 (PST) Received: from m1x-phil.lan ([176.187.210.193]) by smtp.gmail.com with ESMTPSA id m11-20020ac807cb000000b0042e6be98dbasm2997038qth.31.2024.03.05.14.09.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 05 Mar 2024 14:09:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1709676591; x=1710281391; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=iIAUoqwZw8jjQEXl/6GyiIUaJ3twVU9qfT6FoSeBtUo=; b=GVQuvzjOg8/ZZhxnyS+eSqCQLBjKDeNAEKTlSNniVeU0gZAZJilJ4QLl8DVW6tc4uX xmIv8Nof604PciDkE1hRhU5pnxQ6VYtUOxesYyvGAW4N4OQOcZlLpO1xkqJSBbzCVexU XXNcWYJG2o0n4GWr2ABNT77ktb1SHqEktGgvgKpyBOGkNIm5BMBxjlrQFyyTS0QR1vuV TI6Do7NTRTPTPbhSMGPFaxKLX9PlJs3slqd2tadgjr/gTe9qgQUZPQPMvUKF5tO6nJTd qA2NpMlvyUqDvP7nRVVNsa7VsClJzbgJMKGNq8bKhVm3AC7cf6DmOfmSrKWHXjv/KzVn VxKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709676591; x=1710281391; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iIAUoqwZw8jjQEXl/6GyiIUaJ3twVU9qfT6FoSeBtUo=; b=eiDVacJAgvAzcozhtS4OMWN/MoA78cJQZmTskQB/Nw3jiHhLnlPQSZJ1U8uYisAtzg yXyngrcQnko9tvnDAnE6FfzO5BwiqKyMIsreMlO3mMxrasna5C0QyyjXIWsQVWhXqLbz Cm3GJGqAXGe/IUvTegzJ98jEScQQKLeBEONebUO2smR1XRc/9sQglhgjfG8F9dpdiA77 /woLXdbmiGc1XGutGP2ullfHMocsnl73Rhd932FfFBZmsZLDk1TpSHuXcCaj0HeN5J/p xrU5t/czUJg08mtS1WhnogcwSxdGcQ8WgSD8Z/Xi9V4JFxaSDlPAHFgl4JkFIC230KPY HIPg== X-Gm-Message-State: AOJu0YxprilpeDswg16GdkS879wYNZdVlsJRznGA1vXOW0jvEyuJpT25 S83y0Tvyhk9tQIjM72nFwrXEAW3eFoeFusRZTNjlR0JVyaE8rKU1yFwe4znlKdp9T3tHXeD3pgG dnrA= X-Google-Smtp-Source: AGHT+IGaEw+XaJIT3CpIm8ByBxEgcEZcTCoy7C3krS1BcFFUCp8V/I/p4lcSOTyruOFGP0Skvw5WTw== X-Received: by 2002:a05:6122:220d:b0:4c8:90e5:6792 with SMTP id bb13-20020a056122220d00b004c890e56792mr3806749vkb.7.1709676591258; Tue, 05 Mar 2024 14:09:51 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Laurent Vivier , Markus Armbruster , Paolo Bonzini , Beraldo Leal , Eric Blake , Marcel Apfelbaum , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Eduardo Habkost , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thomas Huth , Manos Pitsidianakis , Wainer dos Santos Moschetta , Michael Tokarev , Yanan Wang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 1/2] meson: Make qemu-system binary installation optional Date: Tue, 5 Mar 2024 23:09:37 +0100 Message-ID: <20240305220938.85410-2-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240305220938.85410-1-philmd@linaro.org> References: <20240305220938.85410-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2607:f8b0:4864:20::935; envelope-from=philmd@linaro.org; helo=mail-ua1-x935.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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 @linaro.org) X-ZM-MESSAGEID: 1709676657264100001 In order to allow qemu-system binaries to not be installed by default, add the 'install' key to target dictionaries in the execs[] array. Keep the current default: all binaries are installed. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- meson.build | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index c59ca496f2..51b995f4c7 100644 --- a/meson.build +++ b/meson.build @@ -3913,14 +3913,16 @@ foreach target : target_dirs 'name': 'qemu-system-' + target_name, 'win_subsystem': 'console', 'sources': files('system/main.c'), - 'dependencies': [] + 'dependencies': [], + 'install': true }] if host_os =3D=3D 'windows' and (sdl.found() or gtk.found()) execs +=3D [{ 'name': 'qemu-system-' + target_name + 'w', 'win_subsystem': 'windows', 'sources': files('system/main.c'), - 'dependencies': [] + 'dependencies': [], + 'install': true }] endif if get_option('fuzzing') @@ -3930,6 +3932,7 @@ foreach target : target_dirs 'win_subsystem': 'console', 'sources': specific_fuzz.sources(), 'dependencies': specific_fuzz.dependencies(), + 'install': true }] endif else @@ -3937,7 +3940,8 @@ foreach target : target_dirs 'name': 'qemu-' + target_name, 'win_subsystem': 'console', 'sources': [], - 'dependencies': [] + 'dependencies': [], + 'install': true }] endif foreach exe: execs @@ -3947,7 +3951,7 @@ foreach target : target_dirs endif =20 emulator =3D executable(exe_name, exe['sources'], - install: true, + install: exe['install'], c_args: c_args, dependencies: arch_deps + deps + exe['dependencies'], objects: lib.extract_all_objects(recursive: true), --=20 2.41.0