From patchwork Sun Jun 2 18:16:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niclas Zeising X-Patchwork-Id: 10972505 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 09B456C5 for ; Mon, 3 Jun 2019 07:41:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F061E286D4 for ; Mon, 3 Jun 2019 07:41:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E4D85287AE; Mon, 3 Jun 2019 07:41:07 +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,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 9FD452884E for ; Mon, 3 Jun 2019 07:41:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F0E9889733; Mon, 3 Jun 2019 07:40:48 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail.daemonic.se (mail.daemonic.se [IPv6:2607:f740:d:20::25]) by gabe.freedesktop.org (Postfix) with ESMTPS id 620B489A57 for ; Sun, 2 Jun 2019 18:23:26 +0000 (UTC) Received: from cid.daemonic.se (localhost [IPv6:::1]) by mail.daemonic.se (Postfix) with ESMTP id 45H5y445gZz3khN for ; Sun, 2 Jun 2019 18:17:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at daemonic.se Received: from mail.daemonic.se ([IPv6:::1]) (using TLS with cipher ECDHE-RSA-AES128-GCM-SHA256) by cid.daemonic.se (mailscanner.daemonic.se [IPv6:::1]) (amavisd-new, port 10587) with ESMTPS id UFtaBACOakBo; Sun, 2 Jun 2019 18:17:32 +0000 (UTC) Received: from vivi.daemonic.se.se (vivi.daemonic.se [IPv6:2001:470:dca9:2::4]) by mail.daemonic.se (Postfix) with ESMTPSA id 45H5y36PmZz3khL; Sun, 2 Jun 2019 18:17:31 +0000 (UTC) From: Niclas Zeising To: dri-devel@lists.freedesktop.org Subject: [PATCH libdrm 2/2] meson.build: Fix meson script on FreeBSD Date: Sun, 2 Jun 2019 20:16:00 +0200 Message-Id: <20190602181600.83963-3-zeising@daemonic.se> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190602181600.83963-1-zeising@daemonic.se> References: <20190602181600.83963-1-zeising@daemonic.se> MIME-Version: 1.0 X-Mailman-Approved-At: Mon, 03 Jun 2019 07:40:43 +0000 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=daemonic.se; h= content-transfer-encoding:mime-version:references:in-reply-to :x-mailer:message-id:date:date:subject:subject:from:from :received:received; s=20151023; t=1559499452; bh=qIp+nLTkVbiSwcc dUiiUVLADSqorxYS1TYKfu5C27mM=; b=N20S0YAsuarhOI0pjqg/OYVQOPIWsvS a6A9Qq/bD/d2xSjNLpkzEe6ek+y+JzK3hooppqjRtRNId9pvXsn29bHSpdiooDnm flTtgJNlyoqTJGWr+M3KKLpPFCzsuHvA22He1lHv3xRf0A62SVRSFQm50eOD8AGR k4YLLcNfl+Jg= X-Mailman-Original-Authentication-Results: mailscanner.daemonic.se (amavisd-new); dkim=pass (1024-bit key) reason="pass (just generated, assumed good)" header.d=daemonic.se 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 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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. FreeBSD doesn't normally ship bash, try regular sh instead if we can't find bash. --- meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 64f0d5b1..eb55b918 100644 --- a/meson.build +++ b/meson.build @@ -181,7 +181,7 @@ endif dep_m = cc.find_library('m', required : false) 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) @@ -249,7 +249,7 @@ endif with_man_pages = with_man_pages != 'false' and prog_xslt.found() and prog_sed.found() # Used for tests -prog_bash = find_program('bash') +prog_bash = find_program('bash', 'sh') config.set10('HAVE_VISIBILITY', cc.compiles('''int foo_hidden(void) __attribute__((visibility(("hidden"))));''',