diff options
author | Phil Blundell <philb@gnu.org> | 2011-08-30 17:27:13 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-31 19:59:59 +0100 |
commit | 57aa99368413571bc5333a11ce9bb65f16b3d7e9 (patch) | |
tree | ea4429307ad6133aeb0493ff6bd013bac0dc5432 /meta/recipes-support/libcap/libcap.inc | |
parent | 7a27253f56f4dd14a4fff56d46083009ae9cb421 (diff) | |
download | poky-57aa99368413571bc5333a11ce9bb65f16b3d7e9.tar.gz |
libcap: only enable pam if DISTRO_FEATURES requests it
(From OE-Core rev: 9864b0a8253922e044f61506a4a8e9064aac2bd7)
Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libcap/libcap.inc')
-rw-r--r-- | meta/recipes-support/libcap/libcap.inc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-support/libcap/libcap.inc b/meta/recipes-support/libcap/libcap.inc index 67f7579e1d..350653071e 100644 --- a/meta/recipes-support/libcap/libcap.inc +++ b/meta/recipes-support/libcap/libcap.inc | |||
@@ -5,7 +5,8 @@ HOMEPAGE = "http://sites.google.com/site/fullycapable/" | |||
5 | LICENSE = "BSD | GPLv2" | 5 | LICENSE = "BSD | GPLv2" |
6 | LIC_FILES_CHKSUM = "file://License;md5=3f84fd6f29d453a56514cb7e4ead25f1" | 6 | LIC_FILES_CHKSUM = "file://License;md5=3f84fd6f29d453a56514cb7e4ead25f1" |
7 | 7 | ||
8 | DEPENDS = "libpam attr perl-native-runtime" | 8 | DEPENDS = "attr perl-native-runtime" |
9 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | ||
9 | # attr and pam are disabled by EXTRA_OEMAKE_virtclass-native | 10 | # attr and pam are disabled by EXTRA_OEMAKE_virtclass-native |
10 | DEPENDS_virtclass-native = "perl-native-runtime" | 11 | DEPENDS_virtclass-native = "perl-native-runtime" |
11 | 12 | ||
@@ -20,7 +21,7 @@ do_configure() { | |||
20 | sed -e 's,BUILD_CFLAGS ?=,BUILD_CFLAGS := $(BUILD_CFLAGS),' -i Make.Rules | 21 | sed -e 's,BUILD_CFLAGS ?=,BUILD_CFLAGS := $(BUILD_CFLAGS),' -i Make.Rules |
21 | } | 22 | } |
22 | 23 | ||
23 | EXTRA_OEMAKE = "LIBATTR=yes PAM_CAP=yes INDENT= SYSTEM_HEADERS=${STAGING_INCDIR} RAISE_SETFCAP=no" | 24 | EXTRA_OEMAKE = "LIBATTR=yes PAM_CAP=${@base_contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)} INDENT= SYSTEM_HEADERS=${STAGING_INCDIR} RAISE_SETFCAP=no" |
24 | EXTRA_OEMAKE_virtclass-native = "LIBATTR=no PAM_CAP=no INDENT= " | 25 | EXTRA_OEMAKE_virtclass-native = "LIBATTR=no PAM_CAP=no INDENT= " |
25 | EXTRA_OEMAKE += " lib=${@os.path.basename('${libdir}')}" | 26 | EXTRA_OEMAKE += " lib=${@os.path.basename('${libdir}')}" |
26 | 27 | ||