summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/libepoxy/libepoxy/0001-Make-it-possible-to-disable-the-use-of-dlvsym-needed.patch
diff options
context:
space:
mode:
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.patch58
1 files changed, 0 insertions, 58 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
deleted file mode 100644
index bd49e36314..0000000000
--- a/meta/recipes-graphics/libepoxy/libepoxy/0001-Make-it-possible-to-disable-the-use-of-dlvsym-needed.patch
+++ /dev/null
@@ -1,58 +0,0 @@
1From 9c964427656ef71210e2c5b48b279857806574e9 Mon Sep 17 00:00:00 2001
2From: Francesco Giancane <francescogiancane8@gmail.com>
3Date: Wed, 28 Feb 2018 21:32:24 +0100
4Subject: [PATCH] Make it possible to disable the use of dlvsym() (needed for
5 musl)
6
7Add a patch to work around absence of dlvsym() on musl
8(wasn't previously a problem as autotools weren't building tests by default)
9
10Upstream-Status: Pending
11Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
12Signed-off-by: Francesco Giancane <francescogiancane8@gmail.com>
13---
14 meson_options.txt | 3 +++
15 test/meson.build | 6 +++---
16 2 files changed, 6 insertions(+), 3 deletions(-)
17
18diff --git a/meson_options.txt b/meson_options.txt
19index b5d7c98..aa849c2 100644
20--- a/meson_options.txt
21+++ b/meson_options.txt
22@@ -1,6 +1,9 @@
23 option('docs',
24 type: 'boolean', value: false,
25 description: 'Enable generating the Epoxy API reference (depends on Doxygen)')
26+option('has-dlvsym',
27+ type: 'boolean', value: true,
28+ description: 'Whether dlvsym() is available (it is not when using musl C library)')
29 option('glx',
30 type: 'combo',
31 choices: [ 'auto', 'yes', 'no' ],
32diff --git a/test/meson.build b/test/meson.build
33index c5788b4..4c46ae6 100644
34--- a/test/meson.build
35+++ b/test/meson.build
36@@ -92,8 +92,8 @@ if build_glx
37 [ 'glx_has_extension_nocontext', [ 'glx_has_extension_nocontext.c' ], [], [], true ],
38 [ 'glx_static', [ 'glx_static.c' ], [ '-DNEEDS_TO_BE_STATIC'], [ '-static' ], libtype == 'static' ],
39 [ 'glx_shared_znow', [ 'glx_static.c', ], [], [ '-Wl,-z,now' ], has_znow ],
40- [ 'glx_alias_prefer_same_name', [ 'glx_alias_prefer_same_name.c', 'dlwrap.c', 'dlwrap.h' ], [], [ '-rdynamic' ], not build_apple ],
41- [ 'glx_gles2', [ 'glx_gles2.c', 'dlwrap.c', 'dlwrap.h' ], [], [ '-rdynamic' ], not build_apple ],
42+ [ '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 ],
43+ [ 'glx_gles2', [ 'glx_gles2.c', 'dlwrap.c', 'dlwrap.h' ], [], [ '-rdynamic' ], not build_apple and get_option('has-dlvsym') == true ],
44 ]
45
46 foreach test: glx_tests
47@@ -114,7 +114,7 @@ if build_glx
48 endif
49 endforeach
50
51- if not build_apple
52+ if not build_apple and get_option('has-dlvsym') == true
53 # GLX/EGL tests
54 if build_egl
55 glx_egl_sources = [
56--
572.14.3
58