From patchwork Wed Apr 4 15:38:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Engestrom X-Patchwork-Id: 10322741 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3E72760390 for ; Wed, 4 Apr 2018 15:39:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 30C8428D09 for ; Wed, 4 Apr 2018 15:39:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2556528EB7; Wed, 4 Apr 2018 15:39:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 20CC028D09 for ; Wed, 4 Apr 2018 15:39:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8B8286E219; Wed, 4 Apr 2018 15:39:11 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailapp01.imgtec.com (mailapp01.imgtec.com [195.59.15.196]) by gabe.freedesktop.org (Postfix) with ESMTP id C6FD26E395 for ; Wed, 4 Apr 2018 15:39:09 +0000 (UTC) Received: from hhmail02.hh.imgtec.org (unknown [10.100.10.20]) by Forcepoint Email with ESMTPS id 73DCE907E381B; Wed, 4 Apr 2018 16:39:05 +0100 (IST) Received: from localhost.localdomain (10.60.4.28) by hhmail02.hh.imgtec.org (10.100.10.21) with Microsoft SMTP Server (TLS) id 14.3.382.0; Wed, 4 Apr 2018 16:39:08 +0100 From: Eric Engestrom To: Subject: [PATCH libdrm v2 06/23] meson: split vc4=auto logic to make it easier to read Date: Wed, 4 Apr 2018 16:38:01 +0100 Message-ID: <20180404153818.26179-6-eric.engestrom@imgtec.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180404153818.26179-1-eric.engestrom@imgtec.com> References: <20180320174659.1510-1-eric.engestrom@imgtec.com> <20180404153818.26179-1-eric.engestrom@imgtec.com> MIME-Version: 1.0 X-Originating-IP: [10.60.4.28] X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Dylan Baker Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Eric Engestrom --- meson.build | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 55ad207b6de349863be3..ba8072a19515f8d7aaa4 100644 --- a/meson.build +++ b/meson.build @@ -161,8 +161,10 @@ with_exynos = get_option('exynos') == 'true' with_vc4 = false _vc4 = get_option('vc4') -if _vc4 != 'false' - with_vc4 = _vc4 == 'true' or ['arm', 'aarch64'].contains(host_machine.cpu_family()) +if _vc4 == 'auto' + with_vc4 = ['arm', 'aarch64'].contains(host_machine.cpu_family()) +else + with_vc4 = _vc4 == 'true' endif # XXX: Aparently only freebsd and dragonfly bsd actually need this (and