summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2011-11-25 15:49:04 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2011-11-26 12:55:11 (GMT)
commit30ed378a978e322e5b0243409c84b550f945f13a (patch)
tree3082c3d5caa15aac1637cc88982b3d9289456aad
parent7948b0c621adab123f7585a32c0cf6810f83ca91 (diff)
downloadbuildroot-30ed378a978e322e5b0243409c84b550f945f13a.tar.gz
buildroot-30ed378a978e322e5b0243409c84b550f945f13a.tar.bz2
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>
-rw-r--r--package/php/Config.ext1
-rw-r--r--package/php/php.mk2
2 files changed, 2 insertions, 1 deletions
diff --git a/package/php/Config.ext b/package/php/Config.ext
index 4f1614e..bd630ee 100644
--- 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 a1dde51..7f848b1 100644
--- 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