From patchwork Sat Jun 2 15:32:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 162425 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 9F284B700E for ; Sun, 3 Jun 2012 01:32:52 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 7CB64A02EE; Sat, 2 Jun 2012 15:32:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9u+0KGIuKg5Y; Sat, 2 Jun 2012 15:32:49 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 48E82A0320; Sat, 2 Jun 2012 15:32:49 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 0E4A08F753 for ; Sat, 2 Jun 2012 15:32:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id EED8390EB9 for ; Sat, 2 Jun 2012 15:32:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0HKn3OIElWii for ; Sat, 2 Jun 2012 15:32:46 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from loknar.toptech.com.ar (loknar.toptech.com.ar [74.118.36.95]) by whitealder.osuosl.org (Postfix) with ESMTPS id 6966590EC6 for ; Sat, 2 Jun 2012 15:32:46 +0000 (UTC) Received: from asgard (host4.186-109-25.telecom.net.ar [186.109.25.4]) (authenticated bits=0) by loknar.toptech.com.ar (8.14.5/8.14.5) with ESMTP id q52FWfgL032472 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 2 Jun 2012 12:32:43 -0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1338651165; bh=oktWkazUTfVwE6jTCwZdZgJTr4chAB3J/EdHxas74mU=; h=From:To:Cc:Subject:Date:Message-Id; b=RihvbbiJIiqHvixLaSysR2BAzFsQqNu7gyXShW1JdMIGU8iSz1w/IQcrfswohqa9k GlUoAy45/cqhaTfNPWRuiFvAPAErYoOAi37BUEKCXh/b+lz3w8uVjcHSVOUp6BchWa 8qc18C1BHRPq528u4XEygW04tgD5iuayw4At05Jc= Received: by asgard (sSMTP sendmail emulation); Sat, 02 Jun 2012 12:32:40 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Sat, 2 Jun 2012 12:32:40 -0300 Message-Id: <1338651160-22871-1-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 1.7.3.4 X-Virus-Scanned: clamav-milter 0.97.3 at loknar X-Virus-Status: Clean Subject: [Buildroot] [PATCH] php: fix WDDX extension build failure X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net 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 --- 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)