[oe-commits] [meta-openembedded] 32/46: php: actually enable openssl
git at git.openembedded.org
git at git.openembedded.org
Thu Jul 12 14:21:09 UTC 2018
This is an automated email from the git hooks/post-receive script.
khem pushed a commit to branch master-next
in repository meta-openembedded.
commit 40716b97d84d96bb13dc7f46afbdbf36b511be84
Author: Ross Burton <ross.burton at intel.com>
AuthorDate: Tue Jul 10 16:25:42 2018 +0100
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 at intel.com>
Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
meta-oe/recipes-devtools/php/php.inc | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc
index 066b97c..9eacabe 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"
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list