[oe-commits] Paul Eggleton : uw-imap: make libpam dependency dependent on DISTRO_FEATURES

git at git.openembedded.org git at git.openembedded.org
Mon Jan 5 12:28:59 UTC 2015


Module: meta-openembedded.git
Branch: master-next
Commit: 61ad5138d4ea6b53591dd5f2d9e667f62e5e1d75
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=61ad5138d4ea6b53591dd5f2d9e667f62e5e1d75

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Mon Jan  5 10:33:20 2015 +0000

uw-imap: make libpam dependency dependent on DISTRO_FEATURES

If pam is not in DISTRO_FEATURES, we shouldn't be building it.

Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb b/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb
index e1a9877..52b689e 100644
--- a/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb
+++ b/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb
@@ -4,7 +4,7 @@ SECTION = "devel"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a6a4ddbb7cd2999f6827ee143f6fcd97"
 
-DEPENDS = "openssl libpam"
+DEPENDS = "openssl"
 
 SRC_URI = "ftp://ftp.cac.washington.edu/imap/imap-${PV}.tar.gz \
            file://quote_cctype.patch \
@@ -17,13 +17,16 @@ SRC_URI[sha256sum] = "53e15a2b5c1bc80161d42e9f69792a3fa18332b7b771910131004eb520
 
 S = "${WORKDIR}/imap-${PV}"
 
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
+PACKAGECONFIG[pam] = ",,libpam"
+
 EXTRA_OEMAKE = "CC='${CC}'"
 
 HEADERS = "src/c-client/*.h src/osdep/unix/*.h c-client/auths.c c-client/linkage.c c-client/linkage.h c-client/osdep.h"
 
 do_compile() {
     echo "SSLINCLUDE=${STAGING_INCDIR} SSLLIB=${STAGING_LIBDIR}" > ${S}/SPECIALS
-    oe_runmake lnp
+    oe_runmake ${@bb.utils.contains('PACKAGECONFIG', 'pam', 'lnp', 'slx', d)}
 }
 
 do_install() {



More information about the Openembedded-commits mailing list