From patchwork Tue Mar 12 08:22: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: 779694 Delivered-To: patch@linaro.org Received: by 2002:a5d:604e:0:b0:33e:7753:30bd with SMTP id j14csp1907656wrt; Tue, 12 Mar 2024 01:26:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVvP+kt9PCiOjY6Vy3iWMo/CHc9JlJZRfKT+mtZvg9GiKvEaaglpdXEFdEFXHsUtmPuYdW04cfASNoRNTNeB3rP X-Google-Smtp-Source: AGHT+IFb0TyDdMQ2yDM/z1FnfQL8TMGUvGObiiu1Dr2Yr7EYdhxV0k2j9DN+3iF0s+TuxvxiFOIz X-Received: by 2002:ac8:590a:0:b0:42f:591d:e1c9 with SMTP id 10-20020ac8590a000000b0042f591de1c9mr1030147qty.57.1710231985998; Tue, 12 Mar 2024 01:26:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710231985; cv=none; d=google.com; s=arc-20160816; b=hHuEWWnW2ppkX95KxwSkHRsFOzoWJXJHGj+uUJYJP+WDeSxLailTZOzoghcyknA55A 6NCDIsJ7tbesGSUUUZf1m9MN+ZdbpjdH11rSAP7nuiDBxogdfrOrftRoOmImlItDoXAx doQysAPQrZ52/0aJplFUcqg6q5oo7BzeijKglmAxTBV19adBIzetDMYRJ3VMBKTfSdwx rzghVXM1POJKXjeIpyzk5i1k3rXFxpwm9x4jS9Msx3ehSN/VOl9TYbHkbQkjGepUk8aZ CVVvXoIxUtCTc4TZK87YmojSsc2X8BFm1KlbfQeklli2R05ECeWN/sA7KaNuHL7OewA8 zvCw== 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=6MhT9qADAUndB9gfklgv3b9HSVnHfN7uCmsIepMqwLg=; fh=cBDZFAaENvh8HtlE/AgXig3/HS5PGuYHF0qT0AF5tzU=; b=eHY0v11KKSfJ5Sphv6n5cleOndHf6PsiJELIvl4ojLqrxcl/uaRGLvjqNP9s2HRtPr 3mNYilei6VZcCi3uEhcxQlVKArXeKNTPCws287ndICWj7GgvI3rn3S9LbxKxqmFjh+l6 U1wNApuoWRy+4xsUP9OGi+uD/3jpNCi3pLH+X0PTN6qOq1V3JoOOIwCveURr8XS0cAKB 0ADbX4iW6gmzTaHRg6bp+8Mw+gy2qbkTJ6XFd6ow4Lboc/DfE83XHBbJ/IZ4V5AHvP8U cmtMTHmmB8RwHaFHSvsJZHJIyGkMTdLLEDH1f3VGNQoA06Y0HlhUyxGmvgzAJxh9maaC 9esw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="xWL/6C/B"; 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 v6-20020a05622a144600b0042ef8934be4si7557514qtx.339.2024.03.12.01.26.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2024 01:26:25 -0700 (PDT) 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="xWL/6C/B"; 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 1rjxQv-0007ZT-8X; Tue, 12 Mar 2024 04:24:25 -0400 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 1rjxQb-0006xF-1b for qemu-devel@nongnu.org; Tue, 12 Mar 2024 04:24:08 -0400 Received: from mail-lf1-x12e.google.com ([2a00:1450:4864:20::12e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rjxQX-0001Iy-Os for qemu-devel@nongnu.org; Tue, 12 Mar 2024 04:24:04 -0400 Received: by mail-lf1-x12e.google.com with SMTP id 2adb3069b0e04-51344bebe2fso3943224e87.2 for ; Tue, 12 Mar 2024 01:24:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1710231839; x=1710836639; 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=6MhT9qADAUndB9gfklgv3b9HSVnHfN7uCmsIepMqwLg=; b=xWL/6C/BEhhR51C6D4BIFCZ9he3dZhe3h8yGjAGuPxPUynaUstIjNGhv3hfM8WHMUr IpbDVflnh/lI4PFxfYZU/he+8bdUBvD73vaVLh5IodJ7TY/9dfloteeu8sIVgfk4d0t4 XogbT/MWRl16O9NXDorttmePUj9RV1xsKVWPSsbNCAClCvbTDYmBE8rPVj8lUBg5kZIn 6DaVzbTaZTDAubClBWVxE7QTrD9gjqKu6WOid3UV/ZAwbcHOP+9YDtIv0QyNLEY+8NEX TigUGhlb6D04q+t5fA2n+DLe5Z+CeoUhVf6+z1S/Mm5qllXInkRPPCw0+qR3Z25Du7r4 v1YA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710231839; x=1710836639; 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=6MhT9qADAUndB9gfklgv3b9HSVnHfN7uCmsIepMqwLg=; b=cjrlnKiXSlcwPi6waP3ZU18JxsQMffMdBOc/Dq+CzLO7QWk3AlstSyrTg12OyiBlcd yNsg0MT+wbEMkd43By/C4iY/x8CvXWq/Z+UOLD15UKKVlwx4ycPXiPjbVIP9zQwLOhOD 8QgzzzLQhhygNxvDMFqFHf2mDtHWn35EK79Lig3n8/YniXNf5AcgC6sVMKLLcj1C9AZb wCz/4ZueVESers9GgxIfXfgveN+agxhUq2puXw+H59Ho/v833U1VOY9+YoSd2O/UwFZ2 Sq26TivOEclqr3836xAs6xQPJbukfLh/DhAmSLeQ04XyDzj2vLaszsMVUoOh2t0k/0co A3Mg== X-Gm-Message-State: AOJu0YyDjXGJcwIF0EIXlJUfwKjtcgsa9FHc6o6P4LCiqb6HcS9lHLLK JcRwcRbZGauZpfeZy0HeeevFS61uL+PZzaABjrtWGBcpPSvtn1YnHyJ4Rfmx8Mw5Z7bZNHA03mO N X-Received: by 2002:ac2:42c8:0:b0:512:d78e:90fa with SMTP id n8-20020ac242c8000000b00512d78e90famr5379719lfl.15.1710231839612; Tue, 12 Mar 2024 01:23:59 -0700 (PDT) Received: from m1x-phil.lan ([176.187.206.139]) by smtp.gmail.com with ESMTPSA id l5-20020a056000022500b0033e712b1d9bsm8482375wrz.77.2024.03.12.01.23.57 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 12 Mar 2024 01:23:59 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, qemu-arm@nongnu.org, qemu-block@nongnu.org, Peter Maydell , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Daniel_P_=2E_Berrang?= =?utf-8?q?=C3=A9?= , Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Thomas Huth Subject: [PULL 12/13] meson.build: Always require an objc compiler on macos hosts Date: Tue, 12 Mar 2024 09:22:37 +0100 Message-ID: <20240312082239.69696-13-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240312082239.69696-1-philmd@linaro.org> References: <20240312082239.69696-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::12e; envelope-from=philmd@linaro.org; helo=mail-lf1-x12e.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=unavailable 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 From: Peter Maydell We currently only insist that an ObjectiveC compiler is present on macos hosts if we're building the Cocoa UI. However, since then we've added some other parts of QEMU which are also written in ObjC: the coreaudio audio backend, and the vmnet net backend. This means that if you try to configure QEMU on macos with --disable-cocoa the build will fail: ../meson.build:3741:13: ERROR: No host machine compiler for 'audio/coreaudio.m' Since in practice any macos host will have an ObjC compiler available, rather than trying to gate the compiler detection on an increasingly complicated list of every bit of QEMU that uses ObjC, just require it unconditionally on macos hosts. Resolves https://gitlab.com/qemu-project/qemu/-/issues/2138 Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé Message-ID: <20240311133334.3991537-1-peter.maydell@linaro.org> Signed-off-by: Philippe Mathieu-Daudé --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index f9dbe7634e..e3fab8ce9f 100644 --- a/meson.build +++ b/meson.build @@ -66,7 +66,7 @@ if host_os == 'windows' and add_languages('cpp', required: false, native: false) cxx = meson.get_compiler('cpp') endif if host_os == 'darwin' and \ - add_languages('objc', required: get_option('cocoa'), native: false) + add_languages('objc', required: true, native: false) all_languages += ['objc'] objc = meson.get_compiler('objc') endif