diff options
author | Ross Burton <ross@burtonini.com> | 2021-12-03 16:43:39 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-12-06 11:09:53 +0000 |
commit | 680470cd522a7d4c0fe8bea32801820a10110060 (patch) | |
tree | dc81b828127fbad478219e1798e168f23d839d77 /meta/recipes-graphics/xorg-lib | |
parent | f11d868f47e1191c47758cbaaba9e53606b974f6 (diff) | |
download | poky-680470cd522a7d4c0fe8bea32801820a10110060.tar.gz |
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.
(From OE-Core rev: 1a30af54d335db302393e14a0fa6cac4adbd1bee)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib')
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb | 6 |
1 files changed, 6 insertions, 0 deletions
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 | |||
24 | PACKAGECONFIG[x11] = "-Denable-x11=true,-Denable-x11=false,libxcb xkeyboard-config," | 24 | PACKAGECONFIG[x11] = "-Denable-x11=true,-Denable-x11=false,libxcb xkeyboard-config," |
25 | 25 | ||
26 | PACKAGE_BEFORE_PN += "xkbcli" | 26 | PACKAGE_BEFORE_PN += "xkbcli" |
27 | FILES:${PN} = "" | ||
27 | FILES:xkbcli = "${bindir}/xkbcli ${libexecdir}/xkbcommon/xkbcli-*" | 28 | FILES:xkbcli = "${bindir}/xkbcli ${libexecdir}/xkbcommon/xkbcli-*" |
28 | 29 | ||
30 | python populate_packages:prepend () { | ||
31 | # Put the libraries into separate packages to avoid dependency creep | ||
32 | do_split_packages(d, d.expand('${libdir}'), r'^(lib.*)\.so\.*', '%s', '%s library', extra_depends='', allow_links=True) | ||
33 | } | ||
34 | |||
29 | # Fix a following runtime error: | 35 | # Fix a following runtime error: |
30 | # xkbcommon: ERROR: couldn't find a Compose file for locale "C" | 36 | # xkbcommon: ERROR: couldn't find a Compose file for locale "C" |
31 | RDEPENDS:${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', 'libx11-compose-data', d)}" | 37 | RDEPENDS:${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', 'libx11-compose-data', d)}" |