All of lore.kernel.org
 help / color / mirror / Atom feed
From: Emil Velikov <emil.l.velikov@gmail.com>
To: dri-devel@lists.freedesktop.org
Cc: Niclas Zeising <zeising@daemonic.se>,
	Emil Velikov <emil.l.velikov@gmail.com>
Subject: [PATCH libdrm v2 4/4] meson.build: Fix meson script on FreeBSD
Date: Sun, 16 Jun 2019 14:23:43 +0100	[thread overview]
Message-ID: <20190616132343.26370-4-emil.l.velikov@gmail.com> (raw)
In-Reply-To: <20190616132343.26370-1-emil.l.velikov@gmail.com>

From: Niclas Zeising <zeising@daemonic.se>

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 <emil.l.velikov@gmail.com>
---
 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 <sys/types.h>\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)
-- 
2.21.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

  parent reply	other threads:[~2019-06-16 13:25 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-16 13:23 [PATCH libdrm v2 1/4] meson.build: Fix typo Emil Velikov
2019-06-16 13:23 ` [PATCH libdrm v2 2/4] *symbols-check: use normal shell over bash Emil Velikov
2019-06-16 13:56   ` Niclas Zeising
2019-06-16 13:23 ` [PATCH libdrm v2 3/4] meson: normal shell will do Emil Velikov
2019-06-16 14:02   ` Niclas Zeising
2019-06-16 13:23 ` Emil Velikov [this message]
2019-06-16 14:03   ` [PATCH libdrm v2 4/4] meson.build: Fix meson script on FreeBSD Niclas Zeising
2019-06-17  9:14   ` Eric Engestrom
2019-06-17  9:20     ` Niclas Zeising
2019-06-17 13:44       ` Eric Engestrom
2019-08-01 10:26         ` Niclas Zeising

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190616132343.26370-4-emil.l.velikov@gmail.com \
    --to=emil.l.velikov@gmail.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=zeising@daemonic.se \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.