php: fix build breakage

The zip extension requires zlib, so select it.

[Peter: Only select zlib, not php zlib extension]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/package/php/Config.ext b/package/php/Config.ext
index 4f1614e1d2cbfa7e6d41a2452887ac8efd43a68c..bd630eeb60bcb08d4105ee71ce1a9948b4009385 100644 (file)
--- a/package/php/Config.ext
+++ b/package/php/Config.ext
@@ -125,6 +125,7 @@ config BR2_PACKAGE_PHP_EXT_SYSVSHM
 
 config BR2_PACKAGE_PHP_EXT_ZIP
        bool "zip"
+       select BR2_PACKAGE_ZLIB
        help
          Zip read/write support
 

diff --git a/package/php/php.mk b/package/php/php.mk
index a1dde5172e09792f3386f7938200f7ac9826c8f4..7f848b178c2486d24f5b16d3e2764dacd2abd7ca 100644 (file)
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -70,7 +70,7 @@ ifeq ($(BR2_PACKAGE_PHP_EXT_SIMPLEXML),y)
        PHP_CONF_OPT += --enable-simplexml
 endif
 
-ifeq ($(BR2_PACKAGE_PHP_EXT_ZLIB),y)
+ifneq ($(BR2_PACKAGE_PHP_EXT_ZLIB)$(BR2_PACKAGE_PHP_EXT_ZIP),)
        PHP_CONF_OPT += --with-zlib=$(STAGING_DIR)/usr
        PHP_DEPENDENCIES += zlib
 endif