From patchwork Wed Apr 4 15:37:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Engestrom X-Patchwork-Id: 10322751 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 A449760390 for ; Wed, 4 Apr 2018 15:39:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 95C6628D09 for ; Wed, 4 Apr 2018 15:39:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8A56428D44; Wed, 4 Apr 2018 15:39:25 +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 CB38628E9C for ; Wed, 4 Apr 2018 15:39:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 72A5B6E162; Wed, 4 Apr 2018 15:39:07 +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 1FC2D6E0D8 for ; Wed, 4 Apr 2018 15:39:06 +0000 (UTC) Received: from hhmail02.hh.imgtec.org (unknown [10.100.10.20]) by Forcepoint Email with ESMTPS id AE6B5802E142C; Wed, 4 Apr 2018 16:39:01 +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:04 +0100 From: Eric Engestrom To: Subject: [PATCH libdrm v2 01/23] meson: don't enable libdrm_intel without atomic support Date: Wed, 4 Apr 2018 16:37:56 +0100 Message-ID: <20180404153818.26179-1-eric.engestrom@imgtec.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180320174659.1510-1-eric.engestrom@imgtec.com> References: <20180320174659.1510-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 In the 'auto' case, the `with_atomic` check was bypassed. Signed-off-by: Eric Engestrom --- meson.build | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index 961ee59cff6dc3c2cbb9..e762dcc44bff5deac4d1 100644 --- a/meson.build +++ b/meson.build @@ -71,12 +71,13 @@ config.set10('HAVE_LIB_ATOMIC_OPS', lib_atomics) with_intel = false _intel = get_option('intel') -if _intel != 'false' - if _intel == 'true' and not with_atomics - error('libdrm_intel requires atomics.') - else - with_intel = _intel == 'true' or host_machine.cpu_family().startswith('x86') - endif +if _intel == 'auto' + with_intel = with_atomics and host_machine.cpu_family().startswith('x86') +else + with_intel = _intel == 'true' +endif +if with_intel and not with_atomics + error('libdrm_intel requires atomics.') endif with_radeon = false