aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-07-10 16:25:42 +0100
committerKhem Raj <raj.khem@gmail.com>2018-07-12 07:19:43 -0700
commit40716b97d84d96bb13dc7f46afbdbf36b511be84 (patch)
tree510f97c66081a816c42845427247dada46ed992a /meta-oe
parent63299b239116a70ce4b09dc925c5eaebb63a3052 (diff)
downloadmeta-openembedded-contrib-40716b97d84d96bb13dc7f46afbdbf36b511be84.tar.gz
meta-openembedded-contrib-40716b97d84d96bb13dc7f46afbdbf36b511be84.tar.bz2
meta-openembedded-contrib-40716b97d84d96bb13dc7f46afbdbf36b511be84.zip
php: actually enable openssl
The PHP recipe depends on OpenSSL but support is disabled unless you pass --with-openssl. Add a PACKAGECONFIG for openssl and enable it by default. Also for clarity pass --enable-opcache when the opcache is enabled. Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-devtools/php/php.inc8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc
index 066b97cd26..9eacabe03e 100644
--- a/meta-oe/recipes-devtools/php/php.inc
+++ b/meta-oe/recipes-devtools/php/php.inc
@@ -5,8 +5,7 @@ SECTION = "console/network"
LICENSE = "PHP-3.0"
BBCLASSEXTEND = "native"
-DEPENDS = "zlib bzip2 libxml2 virtual/libiconv php-native lemon-native \
- openssl"
+DEPENDS = "zlib bzip2 libxml2 virtual/libiconv php-native lemon-native"
DEPENDS_class-native = "zlib-native libxml2-native"
PHP_MAJOR_VERSION = "${@d.getVar('PV', True).split('.')[0]}"
@@ -67,7 +66,7 @@ EXTRA_OECONF_class-native = " \
${COMMON_EXTRA_OECONF} \
"
-PACKAGECONFIG ??= "mysql sqlite3 imap opcache \
+PACKAGECONFIG ??= "mysql sqlite3 imap opcache openssl \
${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 pam', d)} \
"
PACKAGECONFIG_class-native = ""
@@ -91,7 +90,8 @@ PACKAGECONFIG[imap] = "--with-imap=${STAGING_DIR_HOST} \
,--without-imap --without-imap-ssl \
,uw-imap"
PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
-PACKAGECONFIG[opcache] = ",--disable-opcache"
+PACKAGECONFIG[opcache] = "--enable-opcache,--disable-opcache"
+PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl"
export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}"
export PHP_PEAR_PHP_BIN = "${STAGING_BINDIR_NATIVE}/php"