From patchwork Sun Nov 25 17:25:07 2012
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [meta-webserver,4/7] modphp: enable bz2, zip and mbstring
Date: Sun, 25 Nov 2012 17:25:07 -0000
From: Eric BENARD <eric@eukrea.com>
X-Patchwork-Id: 39587
Message-Id: <1353864310-20097-4-git-send-email-eric@eukrea.com>
To: openembedded-devel@lists.openembedded.org

- bz2 and zip remove warnings in phpmyadmin
- mbstring is usefull for multibyte strings

Signed-off-by: Eric Bénard <eric@eukrea.com>

---
meta-webserver/recipes-php/modphp/modphp5.inc      | 5 ++++-
 meta-webserver/recipes-php/modphp/modphp_5.3.19.bb | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/meta-webserver/recipes-php/modphp/modphp5.inc b/meta-webserver/recipes-php/modphp/modphp5.inc
index 1db85bf..3302936 100644
--- a/meta-webserver/recipes-php/modphp/modphp5.inc
+++ b/meta-webserver/recipes-php/modphp/modphp5.inc
@@ -1,7 +1,7 @@
 SECTION = "console/network"
 DESCRIPTION = "A server-side, HTML-embedded scripting language. This package provides the apache php module."
 LICENSE = "PHP-3.0"
-DEPENDS = "apache2-native apache2 zlib"
+DEPENDS = "apache2-native apache2 zlib bzip2"
 
 SRC_URI = "http://www.php.net/distributions/php-${PV}.tar.bz2 \
            file://configure.patch \
@@ -36,6 +36,9 @@ EXTRA_OECONF = "--with-apxs2=${STAGING_BINDIR_CROSS}/apxs \
                 --disable-rpath \
                 --libdir=${libdir}/php5 \
                 --with-zlib --with-zlib-dir=${STAGING_DIR_TARGET}${exec_prefix} \
+                --with-bz2=${STAGING_DIR_TARGET}${exec_prefix} \
+                --enable-zip \
+                --enable-mbstring \
                 --with-config-file-path=${sysconfdir}/php/apache2-php5"
 
 PACKAGECONFIG ??= ""
diff --git a/meta-webserver/recipes-php/modphp/modphp_5.3.19.bb b/meta-webserver/recipes-php/modphp/modphp_5.3.19.bb
index 56599d6..ecc6e86 100644
--- a/meta-webserver/recipes-php/modphp/modphp_5.3.19.bb
+++ b/meta-webserver/recipes-php/modphp/modphp_5.3.19.bb
@@ -1,5 +1,5 @@
 include modphp5.inc
-PR = "r0"
+PR = "r1"
 
 SRC_URI[md5sum] = "e1d2a3ec7849d4b3032bd1abf1916aa4"
 SRC_URI[sha256sum] = "814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6"