From patchwork Thu Dec 12 12:51:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208456 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="N1IIyDpg"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZGZ3K8dz9s4Y for ; Fri, 13 Dec 2019 00:22:30 +1100 (AEDT) Received: from localhost ([::1]:59210 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOQF-0004ZZ-PK for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:22:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34041) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyN-0003Xx-PE for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyM-0006nR-Hm for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:39 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:41628) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyM-0006lR-78 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:38 -0500 Received: by mail-wr1-x42f.google.com with SMTP id c9so2602770wrw.8 for ; Thu, 12 Dec 2019 04:53:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=a83lx+Izf0EpmHILVXQryQUbXeFpne4U3rXNLiSgql8=; b=N1IIyDpgZ8J1ZZXRVeDpjQQdcdXTRwZc18708EC8wptmHb+tGV69ghepCt45v8Ig7b zYB2M6WV44TiPnuEhVsFH9rXWtqvwK9sGwz4Ra3ZdhJgxUSjRE+wxCyJkwMSVigTPLK0 c4S8PS9SkgT2ZaNoexIae1PeWNdyaIuP2e8mGlo+tQEWhRTtRm2+Z7biHR/4xv5u7nhP Eq2XYhE6Cf8ne8tk0CoZD6lBIaIwPCFq6RuQt4bt4vKBc3zXTLImvs9qXaXSXu4EJKOL FVwJmAsEZCbhHIFKRAhoTPOWcPKF4GjuZryrP+9SbFdWi7FKGcjhTMpHi4wmvV4+O+Ls OgKQ== 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:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=a83lx+Izf0EpmHILVXQryQUbXeFpne4U3rXNLiSgql8=; b=S0GZLQLdZvHxg8jV/YmTZVFLwMmEi8prd6FW9QSiL/RWLJsNSkBTJ+84LVSKUk9nzH 6I0pK50JbRggar+tANVfImeK2iGrhDUoPZmMpAjKLs4AeDbqngKXMOyFIwKY4V5TOdBH 2dZiUmISptwyn64lY1H1X7piMUEF6ckStIQDUYA1fIfhDifCxg69rWOSK6xiA8MAZ7j6 VKeCsoZzYNyrsJTqTqAFzpPTwaYxgpSJNor2dKs/en+uBaOj6hpvSjsPJu/7HQQto7hY wpDIEIlmdV9hrQYcdIGsne4SjnuXz66soh1k7/uHF897dhBaik8Zovpndw9imagTA9dG 2XuQ== X-Gm-Message-State: APjAAAUvi14IfGUSMe8wqrschpDya7El9B9XsT8qcup9TvS27+lpaQWD WrBi2i7jbl5AQhM7pQE0XtYWr+6g X-Google-Smtp-Source: APXvYqwGaox0HWrQAI1DnqFmNc9810ximwx8jjKRKlY/MYdhs1qltpQqZ2u7Bw9rWmmvv4eLOHYFfA== X-Received: by 2002:a5d:4b8f:: with SMTP id b15mr6561594wrt.100.1576155217009; Thu, 12 Dec 2019 04:53:37 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.35 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:35 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 039/132] meson: add macos dependencies Date: Thu, 12 Dec 2019 13:51:23 +0100 Message-Id: <1576155176-2464-40-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42f 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André 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é Lureau --- meson.build | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 5949e6d..8d5b28b 100644 --- a/meson.build +++ b/meson.build @@ -9,7 +9,7 @@ config_all_disas = 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']) qemu_version_cmd = [find_program('scripts/qemu-version.sh'), meson.current_source_dir(), @@ -37,6 +37,10 @@ m = cc.find_library('m', required: false) util = cc.find_library('util', required: false) socket = [] version_res = [] +coref = [] +iokit = [] +cocoa = [] +hvf = [] if host_machine.system() == 'windows' socket = cc.find_library('ws2_32') @@ -44,6 +48,12 @@ if host_machine.system() == 'windows' version_res = win.compile_resources('version.rc', depend_files: files('pc-bios/qemu-nsis.ico'), include_directories: include_directories('.')) +elif host_machine.system() == 'darwin' + add_languages('objc', required: false) + coref = dependency('appleframeworks', modules: 'CoreFoundation') + iokit = dependency('appleframeworks', modules: 'IOKit') + cocoa = dependency('appleframeworks', modules: 'Cocoa') + hvf = dependency('appleframeworks', modules: 'Hypervisor') endif glib = declare_dependency(compile_args: config_host['GLIB_CFLAGS'].split(), link_args: config_host['GLIB_LIBS'].split())