[PATCH] libcap: only enable pam if DISTRO_FEATURES requests it

[PATCH] libcap: only enable pam if DISTRO_FEATURES requests it

[Phil Blundell]

Signed-off-by: Phil Blundell <philb@gnu.org>
---
 meta/recipes-support/libcap/libcap.inc     |    5 +++--
 meta/recipes-support/libcap/libcap_2.22.bb |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-support/libcap/libcap.inc b/meta/recipes-support/libcap/libcap.inc
index 67f7579..3506530 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/"
 LICENSE = "BSD | GPLv2"
 LIC_FILES_CHKSUM = "file://License;md5=3f84fd6f29d453a56514cb7e4ead25f1"
 
-DEPENDS = "libpam attr perl-native-runtime"
+DEPENDS = "attr perl-native-runtime"
+DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 # attr and pam are disabled by EXTRA_OEMAKE_virtclass-native
 DEPENDS_virtclass-native = "perl-native-runtime"
 
@@ -20,7 +21,7 @@ do_configure() {
 	sed -e 's,BUILD_CFLAGS ?=,BUILD_CFLAGS := $(BUILD_CFLAGS),' -i Make.Rules
 }
 
-EXTRA_OEMAKE = "LIBATTR=yes PAM_CAP=yes INDENT= SYSTEM_HEADERS=${STAGING_INCDIR} RAISE_SETFCAP=no"
+EXTRA_OEMAKE = "LIBATTR=yes PAM_CAP=${@base_contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)} INDENT= SYSTEM_HEADERS=${STAGING_INCDIR} RAISE_SETFCAP=no"
 EXTRA_OEMAKE_virtclass-native = "LIBATTR=no PAM_CAP=no INDENT= "
 EXTRA_OEMAKE += " lib=${@os.path.basename('${libdir}')}"
 
diff --git a/meta/recipes-support/libcap/libcap_2.22.bb b/meta/recipes-support/libcap/libcap_2.22.bb
index bb49c03..a31ba3f 100644
--- a/meta/recipes-support/libcap/libcap_2.22.bb
+++ b/meta/recipes-support/libcap/libcap_2.22.bb
@@ -1,6 +1,6 @@
 require libcap.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI[md5sum] = "ce64058bdb3f086ddbfca8ce6c919845"
 SRC_URI[sha256sum] = "73ebbd4877b5f69dd28b72098e510c5b318bc480f8201c4061ac98b78c04050f"
-- 
1.7.4.1

Re: [PATCH] libcap: only enable pam if DISTRO_FEATURES requests it

[Richard Purdie]

On Tue, 2011-08-30 at 17:27 +0100, Phil Blundell wrote:
> Signed-off-by: Phil Blundell <philb@gnu.org>
> ---
>  meta/recipes-support/libcap/libcap.inc     |    5 +++--
>  meta/recipes-support/libcap/libcap_2.22.bb |    2 +-
>  2 files changed, 4 insertions(+), 3 deletions(-)

Merged to master, thanks.

Richard