drm: Branch 'master'

 configure.ac |    4 ++--
 meson.build  |    3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 9eb6c8a6b1aad741ddd23f8fd85925d795edbee3
Author: Jonathan Gray <[email protected]>
Date:   Tue Feb 20 17:09:14 2018 +1100

    meson/configure.ac: pthread-stubs not present on OpenBSD
    
    pthread-stubs is no longer required on OpenBSD and has been removed.
    libpthread parts involved moved to libc.
    
    Signed-off-by: Jonathan Gray <[email protected]>
    Reviewed-by: Eric Engestrom <[email protected]>
    [Eric: add meson equivalent]
    Signed-off-by: Eric Engestrom <[email protected]>
    Reviewed-by: Emil Velikov <[email protected]>

diff --git a/configure.ac b/configure.ac
index c9c4754c..68270004 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,10 +65,10 @@ AC_CHECK_HEADERS([sys/sysctl.h sys/select.h])
 LT_PREREQ([2.2])
 LT_INIT([disable-static])
 
-dnl pthread-stubs is mandatory on BSD platforms, due to the nature of the
+dnl pthread-stubs is mandatory on some BSD platforms, due to the nature of the
 dnl project. Even then there's a notable issue as described in the project README
 case "$host_os" in
-linux* | cygwin* | darwin* | solaris* | *-gnu* | gnu*)
+linux* | cygwin* | darwin* | solaris* | *-gnu* | gnu* | openbsd*)
     pthread_stubs_possible="no"
     ;;
 * )
diff --git a/meson.build b/meson.build
index 7f786a8c..f6b1a432 100644
--- a/meson.build
+++ b/meson.build
@@ -35,8 +35,7 @@ with_install_tests = get_option('install-test-programs')
 
 config = configuration_data()
 
-# TODO: openbsd is guess, the others are correct
-if ['freebsd', 'dragonfly', 'netbsd', 'openbsd'].contains(host_machine.system())
+if ['freebsd', 'dragonfly', 'netbsd'].contains(host_machine.system())
   dep_pthread_stubs = dependency('pthread-stubs', version : '>= 0.4')
 else
   dep_pthread_stubs = []

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
--