summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2018-01-04 15:12:33 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-05 12:02:37 +0000
commit043f0218491452de223a5f0b47945fc6ec1633eb (patch)
tree622c00deacec31448cf5c36f604a34446c62b6d6
parent7e1df9f68a444b1d6ee1895f272b6de8ba1c031a (diff)
downloadpoky-043f0218491452de223a5f0b47945fc6ec1633eb.tar.gz
libepoxy: convert to meson build
Add a patch to work around absence of dlvsym() on musl (wasn't previously a problem as autotools weren't building tests by default) (From OE-Core rev: aaa523e87c73abc2cf8cf3ea55d9e2c6789d3b9a) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/libepoxy/libepoxy/0001-Make-it-possible-to-disable-the-use-of-dlvsym-needed.patch55
-rw-r--r--meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb12
2 files changed, 63 insertions, 4 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 @@
1From 7bcefd311cd696955376fe2c5298ec85e8f954ce Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 15 Nov 2017 12:48:27 +0200
4Subject: [PATCH] Make it possible to disable the use of dlvsym() (needed for
5 musl)
6
7Upstream-Status: Pending
8Signed-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
15diff --git a/meson_options.txt b/meson_options.txt
16index 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' ],
29diff --git a/test/meson.build b/test/meson.build
30index 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--
542.15.0
55
diff --git a/meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb b/meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb
index 0172322b92..72167a2fb8 100644
--- a/meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb
+++ b/meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb
@@ -6,17 +6,21 @@ LICENSE = "MIT"
6LIC_FILES_CHKSUM = "file://COPYING;md5=58ef4c80d401e07bd9ee8b6b58cf464b" 6LIC_FILES_CHKSUM = "file://COPYING;md5=58ef4c80d401e07bd9ee8b6b58cf464b"
7 7
8SRC_URI = "https://github.com/anholt/${BPN}/releases/download/${PV}/${BP}.tar.xz \ 8SRC_URI = "https://github.com/anholt/${BPN}/releases/download/${PV}/${BP}.tar.xz \
9 file://Add-fallback-definition-for-EGL-CAST.patch" 9 file://Add-fallback-definition-for-EGL-CAST.patch \
10 file://0001-Make-it-possible-to-disable-the-use-of-dlvsym-needed.patch \
11 "
10SRC_URI[md5sum] = "af4c3ce0fb1143bdc4e43f85695a9bed" 12SRC_URI[md5sum] = "af4c3ce0fb1143bdc4e43f85695a9bed"
11SRC_URI[sha256sum] = "0b808a06c9685a62fca34b680abb8bc7fb2fda074478e329b063c1f872b826f6" 13SRC_URI[sha256sum] = "0b808a06c9685a62fca34b680abb8bc7fb2fda074478e329b063c1f872b826f6"
12UPSTREAM_CHECK_URI = "https://github.com/anholt/libepoxy/releases" 14UPSTREAM_CHECK_URI = "https://github.com/anholt/libepoxy/releases"
13 15
14inherit autotools pkgconfig distro_features_check 16inherit meson pkgconfig distro_features_check
15 17
16REQUIRED_DISTRO_FEATURES = "opengl" 18REQUIRED_DISTRO_FEATURES = "opengl"
17 19
18DEPENDS = "util-macros" 20DEPENDS = "util-macros"
19 21
20PACKAGECONFIG[egl] = "--enable-egl, --disable-egl, virtual/egl" 22PACKAGECONFIG[egl] = "-Denable-egl=yes, -Denable-egl=no, virtual/egl"
21PACKAGECONFIG[x11] = "--enable-glx, --disable-glx, virtual/libx11" 23PACKAGECONFIG[x11] = "-Denable-glx=yes, -Denable-glx=no, virtual/libx11"
22PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} egl" 24PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} egl"
25
26EXTRA_OEMESON_append_libc-musl = " -Dhas-dlvsym=false "