Mesa (master): util/meson: Add libnetwork dependency for Haiku

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Sun Jan 10 03:13:33 UTC 2021


Module: Mesa
Branch: master
Commit: 97520d8d48036c64585dd057001fa96868ed01c7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=97520d8d48036c64585dd057001fa96868ed01c7

Author: X512 <danger_mail at list.ru>
Date:   Mon Jan  4 22:10:08 2021 -0600

util/meson: Add libnetwork dependency for Haiku

Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8323>

---

 meson.build          | 6 +++++-
 src/util/meson.build | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 965e14ff2e9..719da783c32 100644
--- a/meson.build
+++ b/meson.build
@@ -448,7 +448,7 @@ endif
 
 # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
 use_elf_tls = false
-if not ['windows', 'freebsd', 'openbsd'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29)
+if not ['windows', 'freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29)
   pre_args += '-DUSE_ELF_TLS'
   use_elf_tls = true
 endif
@@ -1418,6 +1418,10 @@ endif
 # it's not linux and wont
 dep_m = cc.find_library('m', required : false)
 
+if with_platform_haiku
+  dep_network = cc.find_library('network')
+endif
+
 # Check for libdrm. Various drivers have different libdrm version requirements,
 # but we always want to use the same version for all libdrm modules. That means
 # even if driver foo requires 2.4.0 and driver bar requires 2.4.3, if foo and
diff --git a/src/util/meson.build b/src/util/meson.build
index 810ee9369a9..37352efce72 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -185,6 +185,10 @@ if with_platform_android
   )
 endif
 
+if with_platform_haiku
+  deps_for_libmesa_util += dep_network
+endif
+
 _libmesa_util = static_library(
   'mesa_util',
   [files_mesa_util, files_debug_stack, format_srgb],



More information about the mesa-commit mailing list