[oe] [meta-oe][PATCH 1/1] php: zlib and zip support

[akuster808]

On 8/12/19 12:22 PM, Joe Slater wrote:
> Add back zlib support.  Define zip support but do not enable it.
>
> Signed-off-by: Joe Slater <joe.slater at windriver.com>
> ---
>  meta-oe/recipes-devtools/php/php.inc | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc
> index 33bcf12..08173ea 100644
> --- a/meta-oe/recipes-devtools/php/php.inc
> +++ b/meta-oe/recipes-devtools/php/php.inc
> @@ -59,7 +59,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} \
> @@ -81,6 +81,11 @@ PACKAGECONFIG ??= "mysql sqlite3 imap opcache openssl \
>  "
>  PACKAGECONFIG_class-native = ""
>  
> +# For zip, select one or none.  oldzip uses a bundled library and is deprecated.
> +#

How would I know which is old or new? is there a version ref we can
mention? is it a gplv2 or gplv3 thing?

-armin
> +PACKAGECONFIG[newzip] = "--enable-zip --with-libzip=${STAGING_EXECPREFIXDIR},,libzip"
> +PACKAGECONFIG[oldzip] = "--enable-zip --without-libzip,"
> +
>  PACKAGECONFIG[mysql] = "--with-mysql=${STAGING_DIR_TARGET}${prefix} \
>                          --with-mysqli=${STAGING_BINDIR_CROSS}/mysql_config \
>                          --with-pdo-mysql=${STAGING_BINDIR_CROSS}/mysql_config \