summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-devtools/php/php_5.5.20.bb5
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 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 \
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"
70EXTRA_OECONF_class-native = " \ 71EXTRA_OECONF_class-native = " \
@@ -73,7 +74,8 @@ EXTRA_OECONF_class-native = " \
73 ${COMMON_EXTRA_OECONF} \ 74 ${COMMON_EXTRA_OECONF} \
74" 75"
75 76
76PACKAGECONFIG ??= "mysql sqlite3" 77PACKAGECONFIG ??= "mysql sqlite3 \
78 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
77PACKAGECONFIG_class-native = "" 79PACKAGECONFIG_class-native = ""
78 80
79PACKAGECONFIG[mysql] = "--with-mysql=${STAGING_DIR_TARGET}${prefix} \ 81PACKAGECONFIG[mysql] = "--with-mysql=${STAGING_DIR_TARGET}${prefix} \
@@ -89,6 +91,7 @@ PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_LIBDIR}/.. \
89PACKAGECONFIG[pgsql] = "--with-pgsql=${STAGING_DIR_TARGET}${exec_prefix},--without-pgsql,postgresql" 91PACKAGECONFIG[pgsql] = "--with-pgsql=${STAGING_DIR_TARGET}${exec_prefix},--without-pgsql,postgresql"
90PACKAGECONFIG[soap] = "--enable-libxml --enable-soap, --disable-soap, libxml2" 92PACKAGECONFIG[soap] = "--enable-libxml --enable-soap, --disable-soap, libxml2"
91PACKAGECONFIG[apache2] = "--with-apxs2=${STAGING_BINDIR_CROSS}/apxs,,apache2-native apache2" 93PACKAGECONFIG[apache2] = "--with-apxs2=${STAGING_BINDIR_CROSS}/apxs,,apache2-native apache2"
94PACKAGECONFIG[pam] = ",,libpam"
92 95
93 96
94export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}" 97export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}"