From patchwork Sun Jun 16 13:23:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Velikov X-Patchwork-Id: 10997393 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6940013AF for ; Sun, 16 Jun 2019 13:26:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 59A5128508 for ; Sun, 16 Jun 2019 13:26:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4D2C82870D; Sun, 16 Jun 2019 13:26:01 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM,MAILING_LIST_MULTI,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 10B8928508 for ; Sun, 16 Jun 2019 13:26:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 31D1F891AF; Sun, 16 Jun 2019 13:25:56 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2C780890D2 for ; Sun, 16 Jun 2019 13:25:54 +0000 (UTC) Received: by mail-wr1-x443.google.com with SMTP id n9so7084532wru.0 for ; Sun, 16 Jun 2019 06:25:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YIXFYxjY0PSo/FTrg9YlPAOOkll9nxmdcu/C6tztHq0=; b=D3oslEq5TKspolFHuY5tAlVkIF7aUwPt0JaDDesKUKyRJzy2Jz8mzoWdvD0UsDA21m ljDDIocD7+K/tkWu3U3ysu6FqedNAYCUdQn5MOo1aCRFEWspltMMago2PZhEKjDM+k4J EBDCn+OqTmX3lCSl88kRyz0BlgEyUXSsAbXie2x4PO6rsGmMlyUssOtWs+So5exAzpUX xqiWpO1dN0nzkWPq1GLVLXiAUEIAbUHmRLRgOgy4JG5fvp+IebEAzznOKWVhqWM0Rjdn DtdqEfmaULX5M7KGoGDgGPywnuDM4wtnwRZOO2IinWzbjxXi6i1Z3m+Jof7mZvgBdoBg rMWA== X-Gm-Message-State: APjAAAX9amaz18kyFtRXZay32PIBfE7rrxaoS1Ri4qzjqosivkjFawQN K90Hi6bQUzOFu8oFkvXAcsDYXe/F X-Google-Smtp-Source: APXvYqxmwXEeqWm85Pa7u0XEmGe55802qxuqRGnl8XYYdCX7wT0nhKKxU9XlK5xXQc1xqWGabkYufA== X-Received: by 2002:adf:d081:: with SMTP id y1mr27995575wrh.34.1560691552628; Sun, 16 Jun 2019 06:25:52 -0700 (PDT) Received: from localhost.localdomain (cpc91192-cmbg18-2-0-cust374.5-4.cable.virginm.net. [80.6.113.119]) by smtp.gmail.com with ESMTPSA id g2sm9332424wmh.0.2019.06.16.06.25.51 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sun, 16 Jun 2019 06:25:52 -0700 (PDT) From: Emil Velikov To: dri-devel@lists.freedesktop.org Subject: [PATCH libdrm v2 4/4] meson.build: Fix meson script on FreeBSD Date: Sun, 16 Jun 2019 14:23:43 +0100 Message-Id: <20190616132343.26370-4-emil.l.velikov@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190616132343.26370-1-emil.l.velikov@gmail.com> References: <20190616132343.26370-1-emil.l.velikov@gmail.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YIXFYxjY0PSo/FTrg9YlPAOOkll9nxmdcu/C6tztHq0=; b=mX1CePP3W7QUfsvAA+at9sUN3VewUS57Rv8olmxsfzwYQtezfTayMTwkEhrI64uRKs bmQ7pxvmkxd6O0iIc/Chq3BcupgCjfXPtEKMt4QGjvKwEinr3FwEAR3KGTlYUj14RyWx 5KztN1+0ATNXuSfoT2WbzLDsURUx09gS0l15GmLpwhe1DuQC3mjly6ZUuquy7jJsIvG2 oyaeeD03Ql1KHPrK5wmyAG3pJFmg4mfZglJiTY3O8r/ktVtMXHeXt4nym2lLrk1klLwN b2bxasBLgT/kwe1Ff8vwqKYqFxJJiTQIqc5ALD2sWwveKjuiCYi9jSvxlDuw0PbDn913 vKdw== 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: Niclas Zeising , Emil Velikov Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Niclas Zeising FreeBSD requires sys/types.h for sys/sysctl.h, add it as part of the includes when checking for headers. Instead of splitting out the check for sys/sysctl.h from the other header checks, just add sys/types.h to all header checks. v2 [Emil] - add inline comment - drop bash/sh hunk Signed-off-by: Emil Velikov Signed-off-by: Niclas Zeising Reviewed-by: Eric Engestrom --- meson.build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index ed407009..14f82b1f 100644 --- a/meson.build +++ b/meson.build @@ -179,9 +179,12 @@ else dep_rt = [] endif dep_m = cc.find_library('m', required : false) +# From Niclas Zeising: +# FreeBSD requires sys/types.h for sys/sysctl.h, add it as part of the +# includes when checking for headers. foreach header : ['sys/sysctl.h', 'sys/select.h', 'alloca.h'] config.set('HAVE_' + header.underscorify().to_upper(), - cc.compiles('#include <@0@>'.format(header), name : '@0@ works'.format(header))) + cc.compiles('#include \n#include <@0@>'.format(header), name : '@0@ works'.format(header))) endforeach if cc.has_header_symbol('sys/sysmacros.h', 'major') config.set10('MAJOR_IN_SYSMACROS', true)