From patchwork Tue Mar 5 22:09:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 778055 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:47:b0:33e:474f:8c56 with SMTP id k7csp13523wrx; Tue, 5 Mar 2024 14:10:56 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWvsrkzjCIIutoVA4BWkxLeeMSpDfizUjzwW2Vi/hagkDUjHuBJUlhAqoZckn5lIdM+Ri1vQ6du27CyUSUVWOgd X-Google-Smtp-Source: AGHT+IGmc4nidFOkq8mFn5g2VtvvPL6nj8JRUdZLJRr2RtmnkL/+z/nlroGXpRgtiYe2ldvuVQLp X-Received: by 2002:a05:6358:590a:b0:178:6db3:27d0 with SMTP id g10-20020a056358590a00b001786db327d0mr3067968rwf.30.1709676656569; Tue, 05 Mar 2024 14:10:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709676656; cv=none; d=google.com; s=arc-20160816; b=TccLglHmF/bUDvzz2zvt5GxebeA4mLIuCSmqQsQMoBWxYoGzzJBj/H2gy54Jx2PJfE t4LhhR5XFnA4N/nX7HE/HD3WLNOk9fvr6TqQaIRZx1/W2oeTxUY49UcDj+qvwsUsgIR7 /VwnWkoS9fd7puGyTKrsUteJZ4K/aHZSpBvwlTyEWW6njpCefnCuI+yhHrpJQhechZqG On5b7mPqNqWMgJjdKlLRKdtfBP6lndHKbdPrFFcenPPjEdIpg7xQuUkc/vzJocXwtMYT yLKaI9c/CDuof/GfKqiqRV0ThyS7ED5SIxUvAT5+3PvmgvBhPQAVJzUgrDsj9YsmVGF7 bDQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=iIAUoqwZw8jjQEXl/6GyiIUaJ3twVU9qfT6FoSeBtUo=; fh=kEGtYlwZYjtLG3jCDb1HHuODxHSfMXDTVnLVpt9tybw=; b=l/Kx5+Lu6gvbsQtqQfaDDTupYipoNUhVuCzGMzX48cYRNP1qsodN6ElzZc1Jr3IBb4 WmPDAQTFMsxrnjFK4VMZp20C9phq9JusYmDKEr2CtbwSIINSOVEF+IdXb+bKAbpm8rGc G9iZV6uY96pxP/qaq9XJG1jT6uKg6RDK2MVQaE/VrY7aWN2lbc9bcxhe4z++h9sacwkl p6LWqMPvqkpf0jd7nu1LK01u277oQ+XME0djOlrUp/qhFGOCZ2dfEyUVYXuOpElyCUJC 3pb2uzRy9Umfc+OjUkLpK8aYGo/5EJChZOLqQ9pEM5OsyL1nQGek61CyespOAoNMfnnG ehdg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GVQuvzjO; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id iv10-20020ad45cea000000b0068fe276cf6esi13486176qvb.330.2024.03.05.14.10.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 05 Mar 2024 14:10:56 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GVQuvzjO; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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) 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-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) 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) From: =?utf-8?q?Philippe_Mathieu-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_Benn=C3=A9e?= , Eduardo Habkost , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Thomas Huth , Manos Pitsidianakis , Wainer dos Santos Moschetta , Michael Tokarev , Yanan Wang , =?utf-8?q?Philippe_Mathieu-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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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é --- 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 == 'windows' and (sdl.found() or gtk.found()) execs += [{ '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 emulator = 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),