From da2e820471bb72ac72ff190183a826da85df894e Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 1 Mar 2018 22:20:39 +0000 Subject: libepoxy: improve musl patch dlvsym() is used by the libepoxy test suite, but this is glibc-specific and isn't present in musl. Instead of adding an option to control whether dlvsym is available (which could be detected by Meson), as we don't install the test suite simply add an option to disable the entire test suite (and submit the patch upstream). Also remove the build dependency on util-macros as that is a remnant of the autotools build. (From OE-Core rev: 80cee6088fa60eb5197f8ed9d135986b8e7d471a) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-graphics/libepoxy/libepoxy_1.5.0.bb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'meta/recipes-graphics/libepoxy/libepoxy_1.5.0.bb') diff --git a/meta/recipes-graphics/libepoxy/libepoxy_1.5.0.bb b/meta/recipes-graphics/libepoxy/libepoxy_1.5.0.bb index dfdd19248d..5ca0868c22 100644 --- a/meta/recipes-graphics/libepoxy/libepoxy_1.5.0.bb +++ b/meta/recipes-graphics/libepoxy/libepoxy_1.5.0.bb @@ -6,7 +6,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=58ef4c80d401e07bd9ee8b6b58cf464b" SRC_URI = "https://github.com/anholt/${BPN}/releases/download/${PV}/${BP}.tar.xz \ - file://0001-Make-it-possible-to-disable-the-use-of-dlvsym-needed.patch \ + file://no-tests.patch \ " SRC_URI[md5sum] = "63fe3847789258254dcd7e3fdb9e7f5e" SRC_URI[sha256sum] = "4c94995398a6ebf691600dda2e9685a0cac261414175c2adf4645cdfab42a5d5" @@ -16,10 +16,8 @@ inherit meson pkgconfig distro_features_check REQUIRED_DISTRO_FEATURES = "opengl" -DEPENDS = "util-macros" - PACKAGECONFIG[egl] = "-Degl=yes, -Degl=no, virtual/egl" PACKAGECONFIG[x11] = "-Dglx=yes, -Dglx=no, virtual/libx11 virtual/libgl" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} egl" -EXTRA_OEMESON_append_libc-musl = " -Dhas-dlvsym=false " +EXTRA_OEMESON += "-Dtests=false" -- cgit v1.2.3-54-g00ecf