From patchwork Wed Nov 20 11:49:43 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: 844526 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:8b:b0:382:43a8:7b94 with SMTP id m11csp1655062wrx; Wed, 20 Nov 2024 03:50:07 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUZBVr6yemSFiiKndH63tVwiCfBN5FjmYO6Knq2yZ+rcibWCTxLK9V1j8MRYN2J2/TvI0M/ng==@linaro.org X-Google-Smtp-Source: AGHT+IG40KSRcSaBlzDnb+xVqVqAsqsljg5GySEDAu5VGBxd1vggsbkZsQmURhewLI+rJid2/Vt3 X-Received: by 2002:ad4:5ced:0:b0:6d4:1bda:69a with SMTP id 6a1803df08f44-6d4377e098emr29783956d6.15.1732103407694; Wed, 20 Nov 2024 03:50:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1732103407; cv=none; d=google.com; s=arc-20240605; b=FDeFYZUfrCOJXn9ig514Y4Kr9Cs6TCtCOyjPBJ1imMM+Fc8EUYYwSUbk6nKhKgIfHh 1lOIr40bOwZiCHnDIjw3akoEKIr9oiIRXzAGleQ37dwkqwmwW5DnjEUYjuvvbIcYlmja HrrnJEECU4veNlWqJFVAkBEvsUMjktIF6zTtDhANAMs0NaJLKh/rh9Hzd9TLZwLe3WMG PHtz5YYKLC5r2QFpHq90vgCeAxX4RIB9PtLCF2n5TOF+1bUT9kUvkPdCVxPGn9m9n+LW evNQEzQeoep3huzCk0C6aM1bcZAoSk5Ht7UyrstQjhMktDA7JE5hMKS5XBi4CtCr9PfM /b8g== 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:message-id:date:subject:cc:to:from:dkim-signature; bh=72IV67nIElwJocj8hgHcGmaLQKH/wnHy5iI6DeP/Lhw=; fh=DcW7Dfuaj1MCSVkx48Lh5WAS0JjvLCVzHLPiA8jlh5c=; b=Xa8xAjft0vTqBOlEiJmZ47sNPFLIQbHgB+IAFcPfvqxol3BbK7uWpjz3l1e8ZjvAcW bmVwC+6OUP+f4EacMt4Nkz59+RiSyqOuEj5xHbPrLAl1Gc0r6+VgF97uBYDBr0hf6HE0 SZLAaHQOk3wiZt4mC3A6zAICYZabDhZ4MlTx++mET1Bg8MCZp5U9tsJNfZ9zNUbryFI2 jdSFDup+Jo/12gqOLJPFv7enTMsstJNWHYoFCsBtOWYEJ2AO4jqmSo9PrODRVPSxOedc KehhCicU7i9JycgXAXvPFKF29c4blDWnkwFZSqIC8soosXNHi/VYrFCuv+P6hP5DOdF4 yfFw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QU3c8qhi; 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 af79cd13be357-7b48529329esi147574185a.226.2024.11.20.03.50.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 20 Nov 2024 03:50:07 -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=QU3c8qhi; 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 1tDjDV-0000kU-Hr; Wed, 20 Nov 2024 06:49:53 -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 1tDjDS-0000kD-93 for qemu-devel@nongnu.org; Wed, 20 Nov 2024 06:49:50 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tDjDQ-0000cF-OA for qemu-devel@nongnu.org; Wed, 20 Nov 2024 06:49:50 -0500 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-3824a8a5c56so1858814f8f.3 for ; Wed, 20 Nov 2024 03:49:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1732103387; x=1732708187; darn=nongnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=72IV67nIElwJocj8hgHcGmaLQKH/wnHy5iI6DeP/Lhw=; b=QU3c8qhiArW6D3Iu8gAGfoIhjMmaHLwHQRz3LC2Ka8D1EBSgCiy1jE8mAcXWF0Rgrn cukHTmkM6c6n3oIPfFoml+dFW71cco2//sIqDnOZQntnvQVSYDRLf19Z8cYJziXMyc0g sVNahlz+YOhrm4E33gmigliEnqbSzVn6ezPoZWR9k0plogFSSvza4/T1MgFQcvu7YmRP 0yfTtJ2pWKqavOhKi40W998woCXyN0YXDzhTUfpWl5KzFbhYdODbeyNuGFHugnujgFO/ iO8HkXp1EN4kZEqdBI1vUGTZ78ubANn3VHBw851sWLucgqcoJ/mVlFgIvYUaYoUoNIul dDsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732103387; x=1732708187; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=72IV67nIElwJocj8hgHcGmaLQKH/wnHy5iI6DeP/Lhw=; b=Tfi8yPfRAoiYW7U7D1qeOB8Fo2d+1/xXEPvOlBMk2NsdBaZ02WHSzelEMCpe4Syz3J 8/LUlbAQ4twJYDHcBvN/vHpYQujvcmedfDmlTjrpscoShKwrzpgAN/tOvbBx+HapFlXh mrKoQKWQxeAtcPV2mULsdbRIvlPkGxF+ThkZoPjojAY3F4czHxoYkzdkrGd06e5xGVRE 4B85f27cISmUo9b0rDb/7HxPgGwY6/gyEgxVpv1b03e2Dyv5B6SSpo2xFFA/MRKPj49p UakFDQAPZjCdh3Fqm9cD9qFe/6/rdmCGvGofjEquOvsM0+SKec3Tej2IfAMRLlc84ei8 bt4Q== X-Gm-Message-State: AOJu0Yy8tKDUZAARBD9fipA2Y1nziJp8P+ENbI029UapqtUVvcFFMXfk WT5fAnjp0nj7qQW1ciYCMwbUADBmmHIHMvTKQVxBcjSO6HldGXjwVl/KeXILmqxjexycqoFuOt3 N X-Received: by 2002:a05:6000:4012:b0:382:46ea:1125 with SMTP id ffacd0b85a97d-38254b041bcmr1658570f8f.33.1732103386667; Wed, 20 Nov 2024 03:49:46 -0800 (PST) Received: from localhost.localdomain ([176.187.208.27]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-433b4617563sm16448415e9.25.2024.11.20.03.49.45 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 20 Nov 2024 03:49:46 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Dani?= =?utf-8?q?el_P=2E_Berrang=C3=A9?= , Akihiko Odaki , Gerd Hoffmann Subject: [PATCH] meson: Add missing SDL dependency to system/main.c Date: Wed, 20 Nov 2024 12:49:43 +0100 Message-ID: <20241120114943.85080-1-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=philmd@linaro.org; helo=mail-wr1-x434.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: ../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 --- Looking at commit 88c39c8693 ("Simplify softmmu/main.c") I wonder if this header is still required. --- meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index e0b880e4e1..846ffa3834 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')