diff options
Diffstat (limited to 'meta/recipes-graphics/libepoxy/libepoxy/0001-Make-it-possible-to-disable-the-use-of-dlvsym-needed.patch')
-rw-r--r-- | meta/recipes-graphics/libepoxy/libepoxy/0001-Make-it-possible-to-disable-the-use-of-dlvsym-needed.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/meta/recipes-graphics/libepoxy/libepoxy/0001-Make-it-possible-to-disable-the-use-of-dlvsym-needed.patch b/meta/recipes-graphics/libepoxy/libepoxy/0001-Make-it-possible-to-disable-the-use-of-dlvsym-needed.patch new file mode 100644 index 0000000000..c2a2fa3453 --- /dev/null +++ b/meta/recipes-graphics/libepoxy/libepoxy/0001-Make-it-possible-to-disable-the-use-of-dlvsym-needed.patch | |||
@@ -0,0 +1,55 @@ | |||
1 | From 7bcefd311cd696955376fe2c5298ec85e8f954ce Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Wed, 15 Nov 2017 12:48:27 +0200 | ||
4 | Subject: [PATCH] Make it possible to disable the use of dlvsym() (needed for | ||
5 | musl) | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
9 | |||
10 | --- | ||
11 | meson_options.txt | 3 +++ | ||
12 | test/meson.build | 6 +++--- | ||
13 | 2 files changed, 6 insertions(+), 3 deletions(-) | ||
14 | |||
15 | diff --git a/meson_options.txt b/meson_options.txt | ||
16 | index 244476a..071f0b6 100644 | ||
17 | --- a/meson_options.txt | ||
18 | +++ b/meson_options.txt | ||
19 | @@ -1,6 +1,9 @@ | ||
20 | option('enable-docs', | ||
21 | type: 'boolean', value: false, | ||
22 | description: 'Enable generating the Epoxy API reference (depends on Doxygen)') | ||
23 | +option('has-dlvsym', | ||
24 | + type: 'boolean', value: true, | ||
25 | + description: 'Whether dlvsym() is available (it is not when using musl C library)') | ||
26 | option('enable-glx', | ||
27 | type: 'combo', | ||
28 | choices: [ 'auto', 'yes', 'no' ], | ||
29 | diff --git a/test/meson.build b/test/meson.build | ||
30 | index 2340fc6..bc4330b 100644 | ||
31 | --- a/test/meson.build | ||
32 | +++ b/test/meson.build | ||
33 | @@ -86,8 +86,8 @@ if build_glx | ||
34 | [ 'glx_has_extension_nocontext', [ 'glx_has_extension_nocontext.c' ], [], [], true ], | ||
35 | [ 'glx_static', [ 'glx_static.c' ], [ '-DNEEDS_TO_BE_STATIC'], [ '-static' ], libtype == 'static' ], | ||
36 | [ 'glx_shared_znow', [ 'glx_static.c', ], [], [ '-Wl,-z,now' ], has_znow ], | ||
37 | - [ 'glx_alias_prefer_same_name', [ 'glx_alias_prefer_same_name.c', 'dlwrap.c', 'dlwrap.h' ], [], [ '-rdynamic' ], not build_apple ], | ||
38 | - [ 'glx_gles2', [ 'glx_gles2.c', 'dlwrap.c', 'dlwrap.h' ], [], [ '-rdynamic' ], not build_apple ], | ||
39 | + [ '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 ], | ||
40 | + [ 'glx_gles2', [ 'glx_gles2.c', 'dlwrap.c', 'dlwrap.h' ], [], [ '-rdynamic' ], not build_apple and get_option('has-dlvsym') == true ], | ||
41 | ] | ||
42 | |||
43 | foreach test: glx_tests | ||
44 | @@ -108,7 +108,7 @@ if build_glx | ||
45 | endif | ||
46 | endforeach | ||
47 | |||
48 | - if not build_apple | ||
49 | + if not build_apple and get_option('has-dlvsym') == true | ||
50 | # GLX/EGL tests | ||
51 | if build_egl | ||
52 | glx_egl_sources = [ | ||
53 | -- | ||
54 | 2.15.0 | ||
55 | |||