aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-01-01 23:01:41 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2015-01-08 12:04:27 +0100
commit831e145bd695839860641a32b2cdcd6ad4a0921a (patch)
tree6f04730a247b9a0fe5171bc1d49b3c422589e986
parentceb1a79a8f23f843c0f92eb379ce0ded2a7c4202 (diff)
downloadmeta-openembedded-contrib-831e145bd695839860641a32b2cdcd6ad4a0921a.tar.gz
meta-openembedded-contrib-831e145bd695839860641a32b2cdcd6ad4a0921a.tar.bz2
meta-openembedded-contrib-831e145bd695839860641a32b2cdcd6ad4a0921a.zip
php: add PACKAGECONFIG for imap
Allow imap support to be easily disabled; default it to enabled based on previous configuration. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-rw-r--r--meta-oe/recipes-devtools/php/php_5.5.20.bb10
1 files changed, 6 insertions, 4 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 645de04dbb..1c0557fa83 100644
--- a/meta-oe/recipes-devtools/php/php_5.5.20.bb
+++ b/meta-oe/recipes-devtools/php/php_5.5.20.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=52dd90569008fee5bcdbb22d945b1108"
BBCLASSEXTEND = "native"
DEPENDS = "zlib bzip2 libxml2 virtual/libiconv php-native lemon-native \
- uw-imap openssl libmcrypt"
+ openssl libmcrypt"
DEPENDS_class-native = "zlib-native libxml2-native"
SRC_URI = "http://php.net/distributions/php-${PV}.tar.bz2 \
@@ -56,9 +56,7 @@ EXTRA_OECONF = "--enable-mbstring \
--enable-wddx \
--enable-fpm \
--enable-zip \
- --with-imap=${STAGING_DIR_HOST} \
--with-gettext=${STAGING_LIBDIR}/.. \
- --with-imap-ssl=${STAGING_DIR_HOST} \
--with-zlib=${STAGING_LIBDIR}/.. \
--with-iconv=${STAGING_LIBDIR}/.. \
--with-mcrypt=${STAGING_DIR_TARGET}${exec_prefix} \
@@ -74,7 +72,7 @@ EXTRA_OECONF_class-native = " \
${COMMON_EXTRA_OECONF} \
"
-PACKAGECONFIG ??= "mysql sqlite3 \
+PACKAGECONFIG ??= "mysql sqlite3 imap \
${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
PACKAGECONFIG_class-native = ""
@@ -92,6 +90,10 @@ PACKAGECONFIG[pgsql] = "--with-pgsql=${STAGING_DIR_TARGET}${exec_prefix},--witho
PACKAGECONFIG[soap] = "--enable-libxml --enable-soap, --disable-soap, libxml2"
PACKAGECONFIG[apache2] = "--with-apxs2=${STAGING_BINDIR_CROSS}/apxs,,apache2-native apache2"
PACKAGECONFIG[pam] = ",,libpam"
+PACKAGECONFIG[imap] = "--with-imap=${STAGING_DIR_HOST} \
+ --with-imap-ssl=${STAGING_DIR_HOST} \
+ ,--without-imap --without-imap-ssl \
+ ,uw-imap"
export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}"