diff options
| -rw-r--r-- | meta/recipes-core/libcgroup/libcgroup/fts.patch | 20 | ||||
| -rw-r--r-- | meta/recipes-core/libcgroup/libcgroup_2.0.bb | 4 |
2 files changed, 22 insertions, 2 deletions
diff --git a/meta/recipes-core/libcgroup/libcgroup/fts.patch b/meta/recipes-core/libcgroup/libcgroup/fts.patch new file mode 100644 index 00000000000..84e7835494e --- /dev/null +++ b/meta/recipes-core/libcgroup/libcgroup/fts.patch @@ -0,0 +1,20 @@ +Patch configure to look for FTS instead of blindly forcing the linkage. + +Upstream-Status: Pending +Signed-off-by: Ross Burton <ross.burton@arm.com> + +diff --git a/configure.ac b/configure.ac +index cbe5cef..247ea26 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -174,6 +174,10 @@ AC_FUNC_REALLOC + AC_FUNC_STAT + AC_CHECK_FUNCS([getmntent hasmntopt memset mkdir rmdir strdup]) + ++AC_SEARCH_LIBS([fts_open], [fts], [], [ ++ AC_MSG_ERROR([unable to find the fts_open() function]) ++]) ++ + if test x$with_pam = xtrue; then + AC_CHECK_LIB( + [pam], diff --git a/meta/recipes-core/libcgroup/libcgroup_2.0.bb b/meta/recipes-core/libcgroup/libcgroup_2.0.bb index bc0a75d46c1..b26d1276863 100644 --- a/meta/recipes-core/libcgroup/libcgroup_2.0.bb +++ b/meta/recipes-core/libcgroup/libcgroup_2.0.bb @@ -13,13 +13,13 @@ DEPENDS = "bison-native flex-native" SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.bz2 \ file://musl-decls-compat.patch \ - file://module.patch" + file://module.patch \ + file://fts.patch" SRC_URI[sha256sum] = "11a2fbf0e42f46089f406b8b0dca7fef04aec2f21600b70e402c5db3661305d7" UPSTREAM_CHECK_URI = "https://github.com/libcgroup/libcgroup/releases/" DEPENDS:append:libc-musl = " fts " -EXTRA_OEMAKE:append:libc-musl = " LIBS=-lfts" PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" PACKAGECONFIG[pam] = "--enable-pam-module-dir=${base_libdir}/security --enable-pam=yes,--enable-pam=no,libpam" |