From 84bf94bfe9de517842a363a17c53a601b5363382 Mon Sep 17 00:00:00 2001 From: "Slater, Joseph" Date: Thu, 15 Aug 2019 14:26:52 -0700 Subject: php: zlib and zip support Add back zlib support. Define zip support but do not enable it. Signed-off-by: Joe Slater Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/php/php.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc index 785c2f5acc..4c0617c49c 100644 --- a/meta-oe/recipes-devtools/php/php.inc +++ b/meta-oe/recipes-devtools/php/php.inc @@ -47,7 +47,7 @@ EXTRA_OECONF = "--enable-mbstring \ --enable-fpm \ --with-libdir=${baselib} \ --with-gettext=${STAGING_LIBDIR}/.. \ - --with-libzip=${STAGING_LIBDIR}/.. \ + --with-zlib=${STAGING_LIBDIR}/.. \ --with-iconv=${STAGING_LIBDIR}/.. \ --with-bz2=${STAGING_DIR_TARGET}${exec_prefix} \ --with-config-file-path=${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} \ @@ -69,6 +69,8 @@ PACKAGECONFIG ??= "mysql sqlite3 imap opcache openssl \ " PACKAGECONFIG_class-native = "" +PACKAGECONFIG[zip] = "--enable-zip --with-libzip=${STAGING_EXECPREFIXDIR},,libzip" + PACKAGECONFIG[mysql] = "--with-mysql=${STAGING_DIR_TARGET}${prefix} \ --with-mysqli=${STAGING_BINDIR_CROSS}/mysql_config \ --with-pdo-mysql=${STAGING_BINDIR_CROSS}/mysql_config \ -- cgit v1.2.3-54-g00ecf