From 30ed378a978e322e5b0243409c84b550f945f13a Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 25 Nov 2011 12:49:04 -0300 Subject: [PATCH] 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 Signed-off-by: Peter Korsgaard --- package/php/Config.ext | 1 + package/php/php.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/php/Config.ext b/package/php/Config.ext index 4f1614e1d2..bd630eeb60 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 a1dde5172e..7f848b178c 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 -- 2.30.2