From 588a75c413ea2949a9950a751e549f872a800024 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Wed, 31 Dec 2014 17:34:25 +0000 Subject: php: add PACKAGECONFIG to fix implicit dependency on libpam Add a pam PACKAGECONFIG option defaulted from the pam DISTRO_FEATURES item, so that if pam isn't in DISTRO_FEATURES, it is explicitly disabled (and conversely if it is in DISTRO_FEATURES that we have an explicit dependency on libpam). Signed-off-by: Paul Eggleton --- meta-oe/recipes-devtools/php/php_5.5.20.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/php/php_5.5.20.bb b/meta-oe/recipes-devtools/php/php_5.5.20.bb index 7821f0aec1..645de04dbb 100644 --- a/meta-oe/recipes-devtools/php/php_5.5.20.bb +++ b/meta-oe/recipes-devtools/php/php_5.5.20.bb @@ -65,6 +65,7 @@ EXTRA_OECONF = "--enable-mbstring \ --with-bz2=${STAGING_DIR_TARGET}${exec_prefix} \ --with-config-file-path=${sysconfdir}/php/apache2-php5 \ ${@base_conditional('SITEINFO_ENDIANNESS', 'le', 'ac_cv_c_bigendian_php=no', 'ac_cv_c_bigendian_php=yes', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'pam', '', 'ac_cv_lib_pam_pam_start=no', d)} \ ${COMMON_EXTRA_OECONF} \ " EXTRA_OECONF_class-native = " \ @@ -73,7 +74,8 @@ EXTRA_OECONF_class-native = " \ ${COMMON_EXTRA_OECONF} \ " -PACKAGECONFIG ??= "mysql sqlite3" +PACKAGECONFIG ??= "mysql sqlite3 \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" PACKAGECONFIG_class-native = "" PACKAGECONFIG[mysql] = "--with-mysql=${STAGING_DIR_TARGET}${prefix} \ @@ -89,6 +91,7 @@ PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_LIBDIR}/.. \ PACKAGECONFIG[pgsql] = "--with-pgsql=${STAGING_DIR_TARGET}${exec_prefix},--without-pgsql,postgresql" PACKAGECONFIG[soap] = "--enable-libxml --enable-soap, --disable-soap, libxml2" PACKAGECONFIG[apache2] = "--with-apxs2=${STAGING_BINDIR_CROSS}/apxs,,apache2-native apache2" +PACKAGECONFIG[pam] = ",,libpam" export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}" -- cgit 1.2.3-korg