38 lines
1.6 KiB
Diff
38 lines
1.6 KiB
Diff
Source: OpenEmbedded
|
|
Upstream: No
|
|
Reason: Fixes musl compilation
|
|
|
|
--- meson_options.txt
|
|
+++ meson_options.txt
|
|
@@ -1,6 +1,9 @@
|
|
option('docs',
|
|
type: 'boolean', value: false,
|
|
description: 'Enable generating the Epoxy API reference (depends on Doxygen)')
|
|
+option('has-dlvsym',
|
|
+ type: 'boolean', value: true,
|
|
+ description: 'Whether dlvsym() is available (it is not when using musl C library)')
|
|
option('glx',
|
|
type: 'combo',
|
|
choices: [ 'auto', 'yes', 'no' ],
|
|
--- test/meson.build
|
|
+++ test/meson.build
|
|
@@ -92,8 +92,8 @@ if build_glx
|
|
[ 'glx_has_extension_nocontext', [ 'glx_has_extension_nocontext.c' ], [], [], true ],
|
|
[ 'glx_static', [ 'glx_static.c' ], [ '-DNEEDS_TO_BE_STATIC'], [ '-static' ], libtype == 'static' ],
|
|
[ 'glx_shared_znow', [ 'glx_static.c', ], [], [ '-Wl,-z,now' ], has_znow ],
|
|
- [ 'glx_alias_prefer_same_name', [ 'glx_alias_prefer_same_name.c', 'dlwrap.c', 'dlwrap.h' ], [], [ '-rdynamic' ], not build_apple ],
|
|
- [ 'glx_gles2', [ 'glx_gles2.c', 'dlwrap.c', 'dlwrap.h' ], [], [ '-rdynamic' ], not build_apple ],
|
|
+ [ 'glx_alias_prefer_same_name', [ 'glx_alias_prefer_same_name.c', 'dlwrap.c', 'dlwrap.h' ], [], [ '-rdynamic' ], not build_apple and get_option('has-dlvsym') == true ],
|
|
+ [ 'glx_gles2', [ 'glx_gles2.c', 'dlwrap.c', 'dlwrap.h' ], [], [ '-rdynamic' ], not build_apple and get_option('has-dlvsym') == true ],
|
|
]
|
|
|
|
foreach test: glx_tests
|
|
@@ -114,7 +114,7 @@ if build_glx
|
|
endif
|
|
endforeach
|
|
|
|
- if not build_apple
|
|
+ if not build_apple and get_option('has-dlvsym') == true
|
|
# GLX/EGL tests
|
|
if build_egl
|
|
glx_egl_sources = [
|