From 34886e5f39f835dfa12e42c8b1cc135813029b21 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Thu, 1 Jan 2015 23:01:41 +0000 Subject: 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 --- meta-oe/recipes-devtools/php/php_5.5.20.bb | 10 ++++++---- 1 file 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}" -- cgit 1.2.3-korg