add-glx-use-tls.patch 1.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748
  1. From f895a39b7437381a86383dd97250aa2cc7393bff Mon Sep 17 00:00:00 2001
  2. From: maxice8 <thinkabit.ukim@gmail.com>
  3. Date: Thu, 9 Aug 2018 18:37:30 -0300
  4. Subject: [PATCH] meson: add glx-use-tls option.
  5. ---
  6. meson.build | 6 +++++-
  7. meson_options.txt | 6 ++++++
  8. 2 files changed, 11 insertions(+), 1 deletion(-)
  9. diff --git a/meson.build b/meson.build
  10. index 5dbb786..1ab3092 100644
  11. --- a/meson.build
  12. +++ b/meson.build
  13. @@ -340,7 +340,11 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless)
  14. endif
  15. endif
  16. -pre_args += '-DGLX_USE_TLS'
  17. +with_glx_use_tls = get_option('glx-use-tls')
  18. +if with_glx_use_tls
  19. + pre_args += '-DGLX_USE_TLS'
  20. +endif
  21. +
  22. if with_glx != 'disabled'
  23. if not (with_platform_x11 and with_any_opengl)
  24. if with_glx == 'auto'
  25. diff --git a/meson_options.txt b/meson_options.txt
  26. index 496fe38..12981dd 100644
  27. --- a/meson_options.txt
  28. +++ b/meson_options.txt
  29. @@ -195,6 +195,12 @@ option(
  30. choices : ['auto', 'disabled', 'dri', 'xlib', 'gallium-xlib'],
  31. description : 'Build support for GLX platform'
  32. )
  33. +option(
  34. + 'glx-use-tls',
  35. + type : 'boolean',
  36. + value : true,
  37. + description : 'Build support for initial-exec TLS model on GLX platform'
  38. +)
  39. option(
  40. 'egl',
  41. type : 'combo',
  42. --
  43. 2.18.0