aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Gray2018-02-20 00:09:14 -0600
committerEric Engestrom2018-02-20 09:05:20 -0600
commit9eb6c8a6b1aad741ddd23f8fd85925d795edbee3 (patch)
treeb651b3037bd6a0f7a5c00afbf89e478a4fffa987
parent9411f8ea03a4c019a0069845545cae45136596fc (diff)
downloadexternal-libgbm-9eb6c8a6b1aad741ddd23f8fd85925d795edbee3.tar.gz
external-libgbm-9eb6c8a6b1aad741ddd23f8fd85925d795edbee3.tar.xz
external-libgbm-9eb6c8a6b1aad741ddd23f8fd85925d795edbee3.zip
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 <jsg@jsg.id.au> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com> [Eric: add meson equivalent] Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
-rw-r--r--configure.ac4
-rw-r--r--meson.build3
2 files changed, 3 insertions, 4 deletions
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])
65LT_PREREQ([2.2]) 65LT_PREREQ([2.2])
66LT_INIT([disable-static]) 66LT_INIT([disable-static])
67 67
68dnl pthread-stubs is mandatory on BSD platforms, due to the nature of the 68dnl pthread-stubs is mandatory on some BSD platforms, due to the nature of the
69dnl project. Even then there's a notable issue as described in the project README 69dnl project. Even then there's a notable issue as described in the project README
70case "$host_os" in 70case "$host_os" in
71linux* | cygwin* | darwin* | solaris* | *-gnu* | gnu*) 71linux* | cygwin* | darwin* | solaris* | *-gnu* | gnu* | openbsd*)
72 pthread_stubs_possible="no" 72 pthread_stubs_possible="no"
73 ;; 73 ;;
74* ) 74* )
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')
35 35
36config = configuration_data() 36config = configuration_data()
37 37
38# TODO: openbsd is guess, the others are correct 38if ['freebsd', 'dragonfly', 'netbsd'].contains(host_machine.system())
39if ['freebsd', 'dragonfly', 'netbsd', 'openbsd'].contains(host_machine.system())
40 dep_pthread_stubs = dependency('pthread-stubs', version : '>= 0.4') 39 dep_pthread_stubs = dependency('pthread-stubs', version : '>= 0.4')
41else 40else
42 dep_pthread_stubs = [] 41 dep_pthread_stubs = []