Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame] | 1 | From d31718999797ffc4dd177d14760ef7b8fd95ac2f Mon Sep 17 00:00:00 2001 |
| 2 | From: Fabio Berton <fabio.berton@ossystems.com.br> |
| 3 | Date: Wed, 12 Jun 2019 14:15:57 -0300 |
| 4 | Subject: [PATCH 2/3] meson.build: make TLS GLX optional again |
| 5 | Organization: O.S. Systems Software LTDA. |
| 6 | |
| 7 | This was optional with autotools, and needs to be disabled |
| 8 | when using musl C library, for instance. |
| 9 | |
| 10 | Upstream-Status: Pending |
| 11 | |
| 12 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 13 | Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> |
| 14 | --- |
| 15 | meson.build | 4 +++- |
| 16 | meson_options.txt | 7 +++++++ |
| 17 | 2 files changed, 10 insertions(+), 1 deletion(-) |
| 18 | |
| 19 | diff --git a/meson.build b/meson.build |
| 20 | index e11880f2902..7a07974ba61 100644 |
| 21 | --- a/meson.build |
| 22 | +++ b/meson.build |
| 23 | @@ -362,7 +362,9 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless) |
| 24 | endif |
| 25 | endif |
| 26 | |
| 27 | -pre_args += '-DGLX_USE_TLS' |
| 28 | +if get_option('glx-tls') |
| 29 | + pre_args += '-DGLX_USE_TLS' |
| 30 | +endif |
| 31 | if with_glx != 'disabled' |
| 32 | if not (with_platform_x11 and with_any_opengl) |
| 33 | error('Cannot build GLX support without X11 platform support and at least one OpenGL API') |
| 34 | diff --git a/meson_options.txt b/meson_options.txt |
| 35 | index 1f72faabee8..fcd49efea27 100644 |
| 36 | --- a/meson_options.txt |
| 37 | +++ b/meson_options.txt |
| 38 | @@ -339,6 +339,13 @@ option( |
| 39 | value : true, |
| 40 | description : 'Enable direct rendering in GLX and EGL for DRI', |
| 41 | ) |
| 42 | +option( |
| 43 | + 'glx-tls', |
| 44 | + type : 'boolean', |
| 45 | + value : true, |
| 46 | + description : 'Enable TLS support in GLX', |
| 47 | +) |
| 48 | + |
| 49 | option( |
| 50 | 'I-love-half-baked-turnips', |
| 51 | type : 'boolean', |
| 52 | -- |
| 53 | 2.22.0 |
| 54 | |