From patchwork Tue Dec 3 11:31:32 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: 846957 Delivered-To: patch@linaro.org Received: by 2002:a5d:44cd:0:b0:385:e875:8a9e with SMTP id z13csp424944wrr; Tue, 3 Dec 2024 03:33:54 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCU+/zElF9qqVQxTskOw+RLL5zK7GUYf9ZaSuK//Ginikkh7qMNj3iu6s5HfTbLc5vyiNpNBZg==@linaro.org X-Google-Smtp-Source: AGHT+IEUbIMS1fJ5cghDt5raBXpoEtBWsBGHe+ycaypyAEpWCDUXcu0EV3oQTAeZSJWs1NaWxKOp X-Received: by 2002:a05:622a:30c:b0:461:148b:1888 with SMTP id d75a77b69052e-4670c041ff9mr26086541cf.4.1733225633941; Tue, 03 Dec 2024 03:33:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1733225633; cv=none; d=google.com; s=arc-20240605; b=d+LS/MZXPy/dWVN0ZEB4WujYrzrsPe8RZHG1MHZiMDWWU3J//qNg/vCt2qmqWPDgyx thlTUOGU0edkCqSZP+cCMQXJMKEQOv2D9R6rgSDof+exAQtyzHUJNUeGz3GKMeT24/yu z16dFxmBVm4xCVj39/2iobftmXBJKX/UPdztEhOfqK6bWwON5EGmX28GGDeO3PaLMKnZ ZEzO4CmQTiRB+nrcALq1fPUyUdoEYeiexWb7O60ZLSmuUGS9+GGSbKDTfdtBqZQu8Gj1 0XNQqp00d9NQujUly/QljjyXmyNyF+gxE51aDR4D4JuoPXun+mQ0+dbD28vrgVQYOM7Y chFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=+3la+FnavYG5s8brFqSIjvleKq1jzXECMBlEIPY8W0E=; fh=fRG0pe6viGIUjHG6wxFnS2yB5kleyOm2AgOl80C8evU=; b=hGXs4ZCq2KoDKhEVKce4hsiYdE+/fufOJYUi58uJtCf506Z6tV8DFsbEeoMIcpTqyo v+2aqDZFPzgWT8gWC3IngsBMUw6PGkLWH+KvHzNJhkzug8l0EJ73jZZ+cINS7J8gsZT3 kOqSIdNzojljSTZ9tYCLX7zwvaBaD5Q9YM2kIja6IOt91Opjn/EuNziqdbrSZ3uZXbnm ei33kMHppvXOOvnjNHyc8T78rlvNX/Oc7Qo+LGPlafGuJsxUdA5vXi+ZQFEu/JDCN5j4 KvXm+dsKG6KZQowfkkIfMjB6HoqBbZwRdz8H1SJpe5iymLGvAbo8NCEMLBtqi4Li9j7/ 6t1A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=t3bRfOr9; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-466c410226asi139102221cf.334.2024.12.03.03.33.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Dec 2024 03:33:53 -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=t3bRfOr9; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tIR8e-0000QR-FP; Tue, 03 Dec 2024 06:32:20 -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 1tIR8W-0000FU-2O for qemu-devel@nongnu.org; Tue, 03 Dec 2024 06:32:13 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tIR8U-0000aC-HD for qemu-devel@nongnu.org; Tue, 03 Dec 2024 06:32:11 -0500 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-434a9f2da82so47142295e9.2 for ; Tue, 03 Dec 2024 03:32:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1733225529; x=1733830329; 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=+3la+FnavYG5s8brFqSIjvleKq1jzXECMBlEIPY8W0E=; b=t3bRfOr9xAEeaBVUNd3THVoVh1bQqEvg05GjKls4FgfbuBiUtqLiaRmYydx10XPGQS LcIxC34SMdFiWzJWuPPd4hgM7/ja9LUhHFZL86C9gXgEn0M313HasccGmyjyOBbpLTah 41UO+VwkAnfy3Phughl6KMDgX1frSCHYh/4vIvgKeSHTwjnxo2I93TRBK7puAWeypgZk /Icmm8mZzIfGcaIEXChDR87gQkWZGDW10aqbE7N+Ku9GJswLiGC5gqRrECn3qXlJM2GK 4cYLOFMNba2Xp2qnd9f8SEV0mQJONhkrAH3kNT9HrVggKmga2iRAUY//CapyG8Y0gsHH 3r9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733225529; x=1733830329; 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=+3la+FnavYG5s8brFqSIjvleKq1jzXECMBlEIPY8W0E=; b=CrEo/PRVgM+U0hcjvMcgqgv5yZTqTgEzdX8G0vToJBDqtQKnvNgcs3Db4Zsj54UU8k ZbqHA/6Y3dUh6IA0rtj5L1neVem4HLzmb1SaxQeYWvG9pYAmj7Yhb5JBt0R/cDdgrjBE M0TRkRLy8fjK1YeGZK8w2Gm4jDZ5JcJ08DXDGRPEgJEAB3Lo2LCOXP34/3ntoq6NWjbh /J4oQr3y8c4brdJIFgANFdklfgmY0+0OQhtQPR5+r/OKz/thXwGOwDOABYOitkgCU1kA TtyZ7YHSprxXu3RkEdr1+q57VAICg+3zgHHkoOsV88Km1ctbasMOgGZG1VBIA8d6srIp wzCg== X-Gm-Message-State: AOJu0YyvJndIP40NBvC30SofDPMKB4QYKUvgpwNOCYBEXC8ur/dd5MDW byNvZtufaeW4JBOEqeXY0OluPLcIFGppFytCWo8POPuYoR/1nKNQD4BHF4qz0ycms5W/vEi+YKT +H4o= X-Gm-Gg: ASbGnctcZb3x7WBEEj9m8R3eMQvY56P3+QO1rrzp3n/guM0MbymqKFjzSLrARVOoN0U 4j5HTk8ETbYA53D9bDfaZHzAPoU1ORzzqUv5C/Ae1ZZc6LU0NUMORrAXYjf5FT0NbW+cQ76j5YX VWcbOn/Lk1qnl265TRWNGeE3P+QYFuukx/kigE/MxxcHA0QgLtbcRViSBwz0QOHkXuaD8EQnzRd b07kfnwYr7gvOAq5To9kXJfmf4dm1mfftIzIWz+e+cOGsHvhx+0L+yE2+I6z/AVxTdZr58B X-Received: by 2002:a05:600c:3ba5:b0:431:4f29:9542 with SMTP id 5b1f17b1804b1-434d09b1441mr17712145e9.6.1733225528764; Tue, 03 Dec 2024 03:32:08 -0800 (PST) Received: from localhost.localdomain ([176.187.209.146]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-434b0f32793sm189031305e9.31.2024.12.03.03.32.07 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 03 Dec 2024 03:32:08 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paolo Bonzini Subject: [PULL 05/13] meson: Add missing SDL dependency to system/main.c Date: Tue, 3 Dec 2024 12:31:32 +0100 Message-ID: <20241203113140.63513-6-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241203113140.63513-1-philmd@linaro.org> References: <20241203113140.63513-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.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 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 When building QEMU configure with --disable-gtk --disable-cocoa on macOS we get: User interface Cocoa support : NO SDL support : YES 2.30.5 SDL image support : NO GTK support : NO pixman : YES 0.42.2 VTE support : NO PNG support : YES 1.6.43 VNC support : YES VNC SASL support : YES VNC JPEG support : YES 3.0.3 spice protocol support : YES 0.14.4 spice server support : NO curses support : YES brlapi support : NO User defined options cocoa : disabled docs : disabled gtk : disabled ../system/main.c:30:10: fatal error: 'SDL.h' file not found 30 | #include | ^~~~~~~ 1 error generated. Fix by adding the SDL dependency to main.c it's CFLAGS contains the SDL include directory. Fixes: 64ed6f92ff ("meson: link emulators without Makefile.target") Signed-off-by: Philippe Mathieu-Daudé Acked-by: Paolo Bonzini Message-Id: <20241120114943.85080-1-philmd@linaro.org> --- meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index a290dbfa331..147097c652e 100644 --- a/meson.build +++ b/meson.build @@ -4235,14 +4235,14 @@ foreach target : target_dirs 'name': 'qemu-system-' + target_name, 'win_subsystem': 'console', 'sources': files('system/main.c'), - 'dependencies': [] + 'dependencies': [sdl] }] 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': [sdl] }] endif if get_option('fuzzing')