浏览代码

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>
Gustavo Zacarias 13 年之前
父节点
当前提交
30ed378a97
共有 2 个文件被更改,包括 2 次插入1 次删除
  1. 1 0
      package/php/Config.ext
  2. 1 1
      package/php/php.mk

+ 1 - 0
package/php/Config.ext

@@ -125,6 +125,7 @@ config BR2_PACKAGE_PHP_EXT_SYSVSHM
 
 
 config BR2_PACKAGE_PHP_EXT_ZIP
 config BR2_PACKAGE_PHP_EXT_ZIP
 	bool "zip"
 	bool "zip"
+	select BR2_PACKAGE_ZLIB
 	help
 	help
 	  Zip read/write support
 	  Zip read/write support
 
 

+ 1 - 1
package/php/php.mk

@@ -70,7 +70,7 @@ ifeq ($(BR2_PACKAGE_PHP_EXT_SIMPLEXML),y)
 	PHP_CONF_OPT += --enable-simplexml
 	PHP_CONF_OPT += --enable-simplexml
 endif
 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_CONF_OPT += --with-zlib=$(STAGING_DIR)/usr
 	PHP_DEPENDENCIES += zlib
 	PHP_DEPENDENCIES += zlib
 endif
 endif