Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH] php: fix WDDX extension build failure
@ 2012-06-02 15:32 Gustavo Zacarias
  2012-06-05  6:53 ` Peter Korsgaard
  0 siblings, 1 reply; 2+ messages in thread
From: Gustavo Zacarias @ 2012-06-02 15:32 UTC (permalink / raw)
  To: buildroot

Fix WDDX extension build failure.
The documentation and source are conflicting about this, in theory
libexpat support is deprecated and libxml2 can replace it, but it seems
not so for WDDX, so pull in expat for it.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/php/Config.ext |    1 +
 package/php/php.mk     |    6 +++++-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/package/php/Config.ext b/package/php/Config.ext
index 80bab70..2cf71d3 100644
--- a/package/php/Config.ext
+++ b/package/php/Config.ext
@@ -310,6 +310,7 @@ config BR2_PACKAGE_PHP_EXT_SIMPLEXML
 
 config BR2_PACKAGE_PHP_EXT_WDDX
 	bool "WDDX"
+	select BR2_PACKAGE_EXPAT
 	select BR2_PACKAGE_PHP_EXT_LIBXML2
 	help
 	  WDDX support
diff --git a/package/php/php.mk b/package/php/php.mk
index e9bda44..af041c9 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -38,7 +38,6 @@ PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_EXT_SOCKETS),--enable-sockets) \
 		$(if $(BR2_PACKAGE_PHP_EXT_DOM),--enable-dom) \
 		$(if $(BR2_PACKAGE_PHP_EXT_SIMPLEXML),--enable-simplexml) \
 		$(if $(BR2_PACKAGE_PHP_EXT_SOAP),--enable-soap) \
-		$(if $(BR2_PACKAGE_PHP_EXT_WDDX),--enable-wddx) \
 		$(if $(BR2_PACKAGE_PHP_EXT_XML),--enable-xml) \
 		$(if $(BR2_PACKAGE_PHP_EXT_XMLREADER),--enable-xmlreader) \
 		$(if $(BR2_PACKAGE_PHP_EXT_XMLWRITER),--enable-xmlwriter) \
@@ -68,6 +67,11 @@ ifeq ($(BR2_PACKAGE_PHP_EXT_LIBXML2),y)
 	PHP_DEPENDENCIES += libxml2
 endif
 
+ifeq ($(BR2_PACKAGE_PHP_EXT_WDDX),y)
+	PHP_CONF_OPT += --enable-wddx --with-libexpat-dir=$(STAGING_DIR)/usr
+	PHP_DEPENDENCIES += expat
+endif
+
 ifeq ($(BR2_PACKAGE_PHP_EXT_XMLRPC),y)
 	PHP_CONF_OPT += --with-xmlrpc \
 		$(if $(BR2_PACKAGE_LIBICONV),--with-iconv-dir=$(STAGING_DIR)/usr)
-- 
1.7.3.4

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [Buildroot] [PATCH] php: fix WDDX extension build failure
  2012-06-02 15:32 [Buildroot] [PATCH] php: fix WDDX extension build failure Gustavo Zacarias
@ 2012-06-05  6:53 ` Peter Korsgaard
  0 siblings, 0 replies; 2+ messages in thread
From: Peter Korsgaard @ 2012-06-05  6:53 UTC (permalink / raw)
  To: buildroot

>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:

 Gustavo> Fix WDDX extension build failure.  The documentation and
 Gustavo> source are conflicting about this, in theory libexpat support
 Gustavo> is deprecated and libxml2 can replace it, but it seems not so
 Gustavo> for WDDX, so pull in expat for it.

Committed, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-06-05  6:53 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-02 15:32 [Buildroot] [PATCH] php: fix WDDX extension build failure Gustavo Zacarias
2012-06-05  6:53 ` Peter Korsgaard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox