diff options
Diffstat (limited to 'meta/recipes-core/libcgroup/libcgroup_0.41.bb')
-rw-r--r-- | meta/recipes-core/libcgroup/libcgroup_0.41.bb | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/meta/recipes-core/libcgroup/libcgroup_0.41.bb b/meta/recipes-core/libcgroup/libcgroup_0.41.bb index e4b1782ad4..7ddc81e9b7 100644 --- a/meta/recipes-core/libcgroup/libcgroup_0.41.bb +++ b/meta/recipes-core/libcgroup/libcgroup_0.41.bb | |||
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" | |||
9 | 9 | ||
10 | inherit autotools pkgconfig | 10 | inherit autotools pkgconfig |
11 | 11 | ||
12 | DEPENDS = "bison-native flex-native ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | 12 | DEPENDS = "bison-native flex-native" |
13 | 13 | ||
14 | SRC_URI = "${SOURCEFORGE_MIRROR}/project/libcg/${BPN}/v0.41/${BPN}-${PV}.tar.bz2" | 14 | SRC_URI = "${SOURCEFORGE_MIRROR}/project/libcg/${BPN}/v0.41/${BPN}-${PV}.tar.bz2" |
15 | SRC_URI_append_libc-musl = " file://musl-decls-compat.patch" | 15 | SRC_URI_append_libc-musl = " file://musl-decls-compat.patch" |
@@ -20,9 +20,10 @@ SRC_URI[sha256sum] = "e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706 | |||
20 | UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libcg/files/libcgroup/" | 20 | UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libcg/files/libcgroup/" |
21 | 21 | ||
22 | DEPENDS_append_libc-musl = " fts " | 22 | DEPENDS_append_libc-musl = " fts " |
23 | EXTRA_OEMAKE_append_libc-musl = "LIBS=-lfts" | 23 | EXTRA_OEMAKE_append_libc-musl = " LIBS=-lfts" |
24 | 24 | ||
25 | EXTRA_OECONF = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam-module-dir=${base_libdir}/security --enable-pam=yes', '--enable-pam=no', d)}" | 25 | PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" |
26 | PACKAGECONFIG[pam] = "--enable-pam-module-dir=${base_libdir}/security --enable-pam=yes,--enable-pam=no,libpam" | ||
26 | 27 | ||
27 | PACKAGES =+ "cgroups-pam-plugin" | 28 | PACKAGES =+ "cgroups-pam-plugin" |
28 | FILES_cgroups-pam-plugin = "${base_libdir}/security/pam_cgroup.so*" | 29 | FILES_cgroups-pam-plugin = "${base_libdir}/security/pam_cgroup.so*" |
@@ -33,8 +34,8 @@ do_install_append() { | |||
33 | if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then | 34 | if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then |
34 | mkdir -p ${D}/${base_libdir}/ | 35 | mkdir -p ${D}/${base_libdir}/ |
35 | mv -f ${D}${libdir}/libcgroup.so.* ${D}${base_libdir}/ | 36 | mv -f ${D}${libdir}/libcgroup.so.* ${D}${base_libdir}/ |
36 | rel_lib_prefix=`echo ${libdir} | sed 's,\(^/\|\)[^/][^/]*,..,g'` | 37 | rm -f ${D}${libdir}/libcgroup.so |
37 | ln -sf ${rel_lib_prefix}${base_libdir}/libcgroup.so.1 ${D}${libdir}/libcgroup.so | 38 | lnr ${D}${base_libdir}/libcgroup.so.1 ${D}${libdir}/libcgroup.so |
38 | fi | 39 | fi |
39 | # pam modules in ${base_libdir}/security/ should be binary .so files, not symlinks. | 40 | # pam modules in ${base_libdir}/security/ should be binary .so files, not symlinks. |
40 | if [ -f ${D}${base_libdir}/security/pam_cgroup.so.0.0.0 ]; then | 41 | if [ -f ${D}${base_libdir}/security/pam_cgroup.so.0.0.0 ]; then |