From: Ross Burton <ross@burtonini.com>
Date: Fri, 3 Dec 2021 16:43:39 +0000 (+0000)
Subject: libxkbcommon: split libraries into separate packages
X-Git-Tag: uninative-3.5~611
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=1a30af54d335db302393e14a0fa6cac4adbd1bee;p=openembedded-core.git

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 <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

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)}"