libdrm: disable nouveau test for static build
PATCH 1/1 libdrm: disable nouveau test for static build
Fixes:
[46/66] Compiling C object 'tests/nouveau/e47a46e@@threaded at exe/threaded.c.o'.
FAILED: tests/nouveau/e47a46e@@threaded at exe/threaded.c.o ./tests/nouveau/threaded.c:24:10: fatal error: dlfcn.h: No such file or directory #include <dlfcn.h>
[1] http://autobuild.buildroot.net/results/3042637f54d2d232904ea009455cae82e159ea2e
--- ...d-disable-nouveau-tests-for-static-b.patch | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 package/libdrm/0005-tests-meson.build-disable-nouveau-tests-for-static-b.patch
package/libdrm/0005-tests-meson.build-disable-nouveau-tests-for-static-b.patch new file +43 -0
@@ -0,0 +1,43 @@ +From c9036706b9f724f09ac6288f82b53f2e76264ec7 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer <[email protected]> +Date: Mon, 25 Nov 2019 15:59:15 +0100 +Subject: [PATCH] tests/meson.build: disable nouveau tests for static build + +Signed-off-by: Peter Seiderer <[email protected]> +--- +Notes: + + - the existing test/check for static build in meson.build does not + catch this case because e.g. the buildroot toolchain + br-arm-full-static-2019.05.1 provides an empty libdl.a + + 169 # Among others FreeBSD does not have a separate dl library. + 170 if not cc.has_function('dlsym') + 171 dep_dl = cc.find_library('dl', required : with_nouveau) + 172 else + 173 dep_dl = [] + 174 endif +--- + tests/meson.build | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/tests/meson.build b/tests/meson.build +index 6c8ddd9..f7cb5f0 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -44,8 +44,11 @@ endif + if with_etnaviv + subdir('etnaviv') + endif ++lib_type = get_option('default_library') + if with_nouveau +- subdir('nouveau') ++ if lib_type != 'static' ++ subdir('nouveau') ++ endif + endif + + drmsl = executable( +-- +2.24.0 +
Signature · 1 line
2.24.0
PATCH 1/1 libdrm: disable nouveau test for static build
Quoted 7 lines · On Mon, 25 Nov 2019 16:12:29 +0100 Peter Seiderer <[email protected]> wrote:
Fixes:
[46/66] Compiling C object 'tests/nouveau/e47a46e@@threaded at
exe/threaded.c.o'.
FAILED: tests/nouveau/e47a46e@@threaded atexe/threaded.c.o./tests/nouveau/threaded.c:24:10: fatal error:dlfcn.h: No such file or directory #include <dlfcn.h>
Quoted 7 lines
[1] http://autobuild.buildroot.net/results/3042637f54d2d232904ea009455cae82e159ea2e
Signed-off-by Peter Seiderer <[email protected]>--- ...d-disable-nouveau-tests-for-static-b.patch | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 package/libdrm/0005-tests-meson.build-disable-nouveau-tests-for-static-b.patch
Applied to master, thanks. Could you submit the patch upstream ?
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 libdrm: disable nouveau test for static build
Hello Thomas,
Quoted 12 lines · Thomas Petazzoni
Quoted 9 lines · On Mon, 25 Nov 2019 16:12:29 +0100 Peter Seiderer <[email protected]> wrote:
Fixes:
[46/66] Compiling C object 'tests/nouveau/e47a46e@@threaded at
exe/threaded.c.o'.
FAILED: tests/nouveau/e47a46e@@threaded atexe/threaded.c.o./tests/nouveau/threaded.c:24:10: fatal error:dlfcn.h: No such file or directory #include <dlfcn.h>[1] http://autobuild.buildroot.net/results/3042637f54d2d232904ea009455cae82e159ea2e
Quoted 7 lines
Quoted 5 lines
Signed-off-by Peter Seiderer <[email protected]>--- ...d-disable-nouveau-tests-for-static-b.patch | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 package/libdrm/0005-tests-meson.build-disable-nouveau-tests-for-static-b.patchApplied to master, thanks. Could you submit the patch upstream ?
Done, see [1]...
Regards,
Peter
[1] https://gitlab.freedesktop.org/mesa/drm/merge_requests/29
Quoted 4 lines
Thanks,
Thomas