From nobody Mon Feb 9 21:00:00 2026 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1580236777401853.2591673608413; Tue, 28 Jan 2020 10:39:37 -0800 (PST) Received: from localhost ([::1]:35318 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwVlw-00011V-BR for importer@patchew.org; Tue, 28 Jan 2020 13:39:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60219) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwV5N-0008U5-AN for qemu-devel@nongnu.org; Tue, 28 Jan 2020 12:55:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iwV5M-0002P2-6d for qemu-devel@nongnu.org; Tue, 28 Jan 2020 12:55:37 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:34273) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iwV5L-0002Nn-Vc for qemu-devel@nongnu.org; Tue, 28 Jan 2020 12:55:36 -0500 Received: by mail-wm1-x335.google.com with SMTP id s144so2319378wme.1 for ; Tue, 28 Jan 2020 09:55:35 -0800 (PST) Received: from localhost.localdomain (93-36-56-206.ip58.fastwebnet.it. [93.36.56.206]) by smtp.gmail.com with ESMTPSA id o4sm27046968wrx.25.2020.01.28.09.55.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jan 2020 09:55:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HFNCZ7pWzXAToecUolMwlXj4aONy0IJRYuCUtjLrwXI=; b=gxrzIb3yH8BP2IU7zZG5gjMT+IqsKMqfOdK/RQnd89DC5VLwd4oJ+O/t5EQg58RGY7 +Rb4QE/PLVb6lCVcYZfhrJlkQdaDqUm22e0N+898vm92ofUNrOvOdI9e0RQbZh2FCudY HUB9dJEOvn2jCmdEbap6KfrQlvxYs05yDBEZec4LlHUyHRdgGBd7UyWtKMCFCvLlqp4L 9icxyFITs37IQIHvh2dJLk6sORxjEix0Q223vd2vVZyqHF5VTfk3a6v7STewpJtcgAme BPL7BcuMHHj5fLMgK+n1KY2qZkSAcAqsclDi7ZVYLVots9QJ1kerquSHeFwXXCCanVYw F8pQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=HFNCZ7pWzXAToecUolMwlXj4aONy0IJRYuCUtjLrwXI=; b=DuAr0sxRtNvpwr1snmbDPt56gMKU+vivFXuSIGXDHVF+BbhlRErhiv0d4kKnKzf0ut DZPpQ5iWXP2i7M61afxe0Wd6AxEhrHMmhhwUSgXoChCxYGwYasDGqT6TlFwY+TCbDlsO szAVJ1kVxbGlc3IGmKvu3Rzm0EJbwdJvb8OvN6gxRZMitPG7gqA5VVlih8w/aUCtxQt4 hkTVucWHXQOw7ZGp+6CI3XuCLooF0zdtu4mTAthniVnx9aNS3RdYdC5uasB0XlfI8x+w ciO3tV1rHyqLsDvSy4Wtt1cKxCwH46ql63tKcwqgq4a6WKD7CPqzufo7wzWQTTUA8W6H o07Q== X-Gm-Message-State: APjAAAUq0AQVXN4Hjbx4X2zakdO8FbUFlfo1/bxmNokUNT3cL+18O5PT z0DApXYFSlIqcoYYliyAmfcr77Rk X-Google-Smtp-Source: APXvYqygPSBapjuvOQd1q4Y5wQafNPcs5vU8zCn43/hgwx6uvQuSQU0aagq64FfFDHklb8qdyYX0Hw== X-Received: by 2002:a7b:cbc9:: with SMTP id n9mr6421449wmi.89.1580234134658; Tue, 28 Jan 2020 09:55:34 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 045/142] meson: add macos dependencies Date: Tue, 28 Jan 2020 18:52:05 +0100 Message-Id: <20200128175342.9066-46-pbonzini@redhat.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200128175342.9066-1-pbonzini@redhat.com> References: <20200128175342.9066-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::335 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Marc-Andr=C3=A9 Lureau There is no probing in configure, so no need to pass them as variables to meson. Do a regular meson dependency() instead. Signed-off-by: Marc-Andr=C3=A9 Lureau --- meson.build | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 06f531d2b7..3c398d1bf5 100644 --- a/meson.build +++ b/meson.build @@ -9,7 +9,7 @@ config_all_disas =3D kconfig.load(meson.current_build_dir()= / 'config-all-disas.ma add_project_arguments(config_host['CFLAGS'].split(), language: ['c', 'objc']) add_project_arguments(config_host['QEMU_CFLAGS'].split(), - language: 'c') + language: ['c', 'objc']) add_project_arguments(config_host['QEMU_CXXFLAGS'].split(), language: 'cpp') add_project_link_arguments(config_host['LDFLAGS'].split(), @@ -17,7 +17,7 @@ add_project_link_arguments(config_host['LDFLAGS'].split(), add_project_link_arguments(config_host['QEMU_LDFLAGS'].split(), language: ['c', 'cpp', 'objc']) add_project_arguments(config_host['QEMU_INCLUDES'].split(), - language: ['c', 'cpp']) + language: ['c', 'cpp', 'objc']) =20 qemu_version_cmd =3D [find_program('scripts/qemu-version.sh'), meson.current_source_dir(), @@ -37,6 +37,10 @@ m =3D cc.find_library('m', required: false) util =3D cc.find_library('util', required: false) socket =3D [] version_res =3D [] +coref =3D [] +iokit =3D [] +cocoa =3D [] +hvf =3D [] if host_machine.system() =3D=3D 'windows' socket =3D cc.find_library('ws2_32') =20 @@ -44,6 +48,12 @@ if host_machine.system() =3D=3D 'windows' version_res =3D win.compile_resources('version.rc', depend_files: files('pc-bios/qemu-ns= is.ico'), include_directories: include_directo= ries('.')) +elif host_machine.system() =3D=3D 'darwin' + add_languages('objc', required: false) + coref =3D dependency('appleframeworks', modules: 'CoreFoundation') + iokit =3D dependency('appleframeworks', modules: 'IOKit') + cocoa =3D dependency('appleframeworks', modules: 'Cocoa') + hvf =3D dependency('appleframeworks', modules: 'Hypervisor') endif glib =3D declare_dependency(compile_args: config_host['GLIB_CFLAGS'].split= (), link_args: config_host['GLIB_LIBS'].split()) --=20 2.21.0