[Buildroot] [git commit] php: fix build breakage

Peter Korsgaard jacmet at sunsite.dk
Sat Nov 26 12:55:11 UTC 2011


commit: http://git.buildroot.net/buildroot/commit/?id=30ed378a978e322e5b0243409c84b550f945f13a
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master

The zip extension requires zlib, so select it.

[Peter: Only select zlib, not php zlib extension]
Signed-off-by: Gustavo Zacarias <gustavo at zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet at sunsite.dk>
---
 package/php/Config.ext |    1 +
 package/php/php.mk     |    2 +-
 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


More information about the buildroot mailing list