From 047fb6c66a27bbc7fd6f591a1d068731d7cd58de Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 17 Sep 2022 10:01:30 -0700 Subject: cairo,xwayland: Fix compiling with musl with vivante gpu driver libs This ensures that the symbols from the prebuilt libs are not flagged during build, we are betting on gcompat to provide the missing glibc API stubs at runtime. Depend on gcompat on musl needed for imxgpu machines its needed since graphics driver is precompiled for glibc. Signed-off-by: Khem Raj (cherry picked from commit fa4112e43fc4edc4a8521eddd459606328be647e) --- recipes-graphics/cairo/cairo_%.bbappend | 2 +- recipes-graphics/xwayland/xwayland_%.bbappend | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/recipes-graphics/cairo/cairo_%.bbappend b/recipes-graphics/cairo/cairo_%.bbappend index 245adb591..c61e9a589 100644 --- a/recipes-graphics/cairo/cairo_%.bbappend +++ b/recipes-graphics/cairo/cairo_%.bbappend @@ -3,6 +3,6 @@ PACKAGECONFIG:remove:imxgpu3d = "opengl" # links with imx-gpu libs which are pre-built for glibc # gcompat will address it during runtime -LDFLAGS:append:imxgpu3d:libc-musl = " -Wl,--allow-shlib-undefined" LDFLAGS:append:imxgpu:libc-musl = " -Wl,--allow-shlib-undefined" +RDEPENDS:${PN}:append:imxgpu:libc-musl = " gcompat" diff --git a/recipes-graphics/xwayland/xwayland_%.bbappend b/recipes-graphics/xwayland/xwayland_%.bbappend index 690631215..f2141f4f9 100644 --- a/recipes-graphics/xwayland/xwayland_%.bbappend +++ b/recipes-graphics/xwayland/xwayland_%.bbappend @@ -10,3 +10,10 @@ OPENGL_PKGCONFIGS_REMOVE_IMXGPU = "" OPENGL_PKGCONFIGS_REMOVE_IMXGPU:mx6-nxp-bsp = "glamor glx" OPENGL_PKGCONFIGS_REMOVE_IMXGPU:mx7-nxp-bsp = "glamor glx" OPENGL_PKGCONFIGS_REMOVE_IMXGPU:mx8-nxp-bsp = "glx" + + +# links with imx-gpu libs which are pre-built for glibc +# gcompat will address it during runtime +LDFLAGS:append:imxgpu:libc-musl = " -Wl,--allow-shlib-undefined" + +RDEPENDS:${PN}:append:imxgpu:libc-musl = " gcompat" -- cgit v1.2.3-54-g00ecf