From 1a30af54d335db302393e14a0fa6cac4adbd1bee Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 3 Dec 2021 16:43:39 +0000 Subject: [PATCH] libxkbcommon: split libraries into separate packages The sublibraries, such as libxkbcommon-x11, have specific linkage, so to avoid link creep they can be put into separate packages. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb index 49eb072778..034f1a0761 100644 --- a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb +++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb @@ -24,8 +24,14 @@ PACKAGECONFIG[wayland] = "-Denable-wayland=true,-Denable-wayland=false,wayland-n PACKAGECONFIG[x11] = "-Denable-x11=true,-Denable-x11=false,libxcb xkeyboard-config," PACKAGE_BEFORE_PN += "xkbcli" +FILES:${PN} = "" FILES:xkbcli = "${bindir}/xkbcli ${libexecdir}/xkbcommon/xkbcli-*" +python populate_packages:prepend () { + # Put the libraries into separate packages to avoid dependency creep + do_split_packages(d, d.expand('${libdir}'), r'^(lib.*)\.so\.*', '%s', '%s library', extra_depends='', allow_links=True) +} + # Fix a following runtime error: # xkbcommon: ERROR: couldn't find a Compose file for locale "C" RDEPENDS:${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', 'libx11-compose-data', d)}" -- 2.40.1