summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/libcgroup
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2023-02-14 16:42:04 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-02-19 07:47:53 +0000
commitaa2839b49c277d0a9efd3891684a6dc6f3405228 (patch)
tree043ab0dc70f58b79bd5085d4e467b0b654d72153 /meta/recipes-core/libcgroup
parent990b7923ea6a4e805619078486dce5950320f727 (diff)
downloadpoky-aa2839b49c277d0a9efd3891684a6dc6f3405228.tar.gz
libcgroup: clean up musl DEPENDS
libcgroup uses fts_* functions, but these are not implemented in musl so we depend on the fts recipe and force a link to libfts. However since 3.0.0 libcgroup will automatically look for fts_open in both libc and libfts[1], so this can be simplified to just a conditional DEPENDS. [1] https://github.com/libcgroup/libcgroup/commit/27ba904355575153308bdc0fa48344ef1be55ca1 (From OE-Core rev: 59be1d5a7e78c6fe6bf01e523439f91871be9718) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/libcgroup')
-rw-r--r--meta/recipes-core/libcgroup/libcgroup_3.0.0.bb4
1 files changed, 1 insertions, 3 deletions
diff --git a/meta/recipes-core/libcgroup/libcgroup_3.0.0.bb b/meta/recipes-core/libcgroup/libcgroup_3.0.0.bb
index 9937a17fb5..457b965481 100644
--- a/meta/recipes-core/libcgroup/libcgroup_3.0.0.bb
+++ b/meta/recipes-core/libcgroup/libcgroup_3.0.0.bb
@@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4d794c5d710e5b3547a6cc6a6609a641"
10inherit autotools pkgconfig github-releases 10inherit autotools pkgconfig github-releases
11 11
12DEPENDS = "bison-native flex-native" 12DEPENDS = "bison-native flex-native"
13DEPENDS:append:libc-musl = " fts"
13 14
14SRC_URI = "${GITHUB_BASE_URI}/download/v3.0/${BP}.tar.gz \ 15SRC_URI = "${GITHUB_BASE_URI}/download/v3.0/${BP}.tar.gz \
15 file://0001-api-Use-GNU-strerror_r-when-available.patch \ 16 file://0001-api-Use-GNU-strerror_r-when-available.patch \
@@ -18,9 +19,6 @@ UPSTREAM_CHECK_URI = "https://github.com/libcgroup/libcgroup/tags"
18 19
19SRC_URI[sha256sum] = "8d284d896fca1c981b55850e92acd3ad9648a69227c028dda7ae3402af878edd" 20SRC_URI[sha256sum] = "8d284d896fca1c981b55850e92acd3ad9648a69227c028dda7ae3402af878edd"
20 21
21DEPENDS:append:libc-musl = " fts "
22EXTRA_OEMAKE:append:libc-musl = " LIBS=-lfts"
23
24PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" 22PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}"
25PACKAGECONFIG[pam] = "--enable-pam-module-dir=${base_libdir}/security --enable-pam=yes,--enable-pam=no,libpam" 23PACKAGECONFIG[pam] = "--enable-pam-module-dir=${base_libdir}/security --enable-pam=yes,--enable-pam=no,libpam"
26 24