diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2014-12-31 17:34:25 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-01-08 12:04:26 +0100 |
commit | ceb1a79a8f23f843c0f92eb379ce0ded2a7c4202 (patch) | |
tree | e865160d0118a514dedf08d77ec277f2ceaa8d77 /meta-oe/recipes-devtools/php | |
parent | d422f96d46d2f22059d025fa798ec5659893a749 (diff) | |
download | meta-openembedded-ceb1a79a8f23f843c0f92eb379ce0ded2a7c4202.tar.gz |
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 <paul.eggleton@linux.intel.com>
Diffstat (limited to 'meta-oe/recipes-devtools/php')
-rw-r--r-- | meta-oe/recipes-devtools/php/php_5.5.20.bb | 5 |
1 files changed, 4 insertions, 1 deletions
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 7821f0aec..645de04db 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 \ | |||
65 | --with-bz2=${STAGING_DIR_TARGET}${exec_prefix} \ | 65 | --with-bz2=${STAGING_DIR_TARGET}${exec_prefix} \ |
66 | --with-config-file-path=${sysconfdir}/php/apache2-php5 \ | 66 | --with-config-file-path=${sysconfdir}/php/apache2-php5 \ |
67 | ${@base_conditional('SITEINFO_ENDIANNESS', 'le', 'ac_cv_c_bigendian_php=no', 'ac_cv_c_bigendian_php=yes', d)} \ | 67 | ${@base_conditional('SITEINFO_ENDIANNESS', 'le', 'ac_cv_c_bigendian_php=no', 'ac_cv_c_bigendian_php=yes', d)} \ |
68 | ${@bb.utils.contains('PACKAGECONFIG', 'pam', '', 'ac_cv_lib_pam_pam_start=no', d)} \ | ||
68 | ${COMMON_EXTRA_OECONF} \ | 69 | ${COMMON_EXTRA_OECONF} \ |
69 | " | 70 | " |
70 | EXTRA_OECONF_class-native = " \ | 71 | EXTRA_OECONF_class-native = " \ |
@@ -73,7 +74,8 @@ EXTRA_OECONF_class-native = " \ | |||
73 | ${COMMON_EXTRA_OECONF} \ | 74 | ${COMMON_EXTRA_OECONF} \ |
74 | " | 75 | " |
75 | 76 | ||
76 | PACKAGECONFIG ??= "mysql sqlite3" | 77 | PACKAGECONFIG ??= "mysql sqlite3 \ |
78 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" | ||
77 | PACKAGECONFIG_class-native = "" | 79 | PACKAGECONFIG_class-native = "" |
78 | 80 | ||
79 | PACKAGECONFIG[mysql] = "--with-mysql=${STAGING_DIR_TARGET}${prefix} \ | 81 | PACKAGECONFIG[mysql] = "--with-mysql=${STAGING_DIR_TARGET}${prefix} \ |
@@ -89,6 +91,7 @@ PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_LIBDIR}/.. \ | |||
89 | PACKAGECONFIG[pgsql] = "--with-pgsql=${STAGING_DIR_TARGET}${exec_prefix},--without-pgsql,postgresql" | 91 | PACKAGECONFIG[pgsql] = "--with-pgsql=${STAGING_DIR_TARGET}${exec_prefix},--without-pgsql,postgresql" |
90 | PACKAGECONFIG[soap] = "--enable-libxml --enable-soap, --disable-soap, libxml2" | 92 | PACKAGECONFIG[soap] = "--enable-libxml --enable-soap, --disable-soap, libxml2" |
91 | PACKAGECONFIG[apache2] = "--with-apxs2=${STAGING_BINDIR_CROSS}/apxs,,apache2-native apache2" | 93 | PACKAGECONFIG[apache2] = "--with-apxs2=${STAGING_BINDIR_CROSS}/apxs,,apache2-native apache2" |
94 | PACKAGECONFIG[pam] = ",,libpam" | ||
92 | 95 | ||
93 | 96 | ||
94 | export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}" | 97 | export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}" |