Patchwork [meta-webserver] modphp: call gnu-configize in do_configure

login
register
mail settings
Submitter Paul Eggleton
Date Oct. 15, 2012, 1:19 p.m.
Message ID <1350307188-12001-1-git-send-email-paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/38161/
State Accepted
Commit 6fe4073a2618c1c962972dc83523b72fc1d66e31
Headers show

Comments

Paul Eggleton - Oct. 15, 2012, 1:19 p.m.
Since we override do_configure, gnu-configize doesn't get called and
using the old gnu-config files distributed with the PHP source can cause
problems for some people e.g. building for AArch64; so add a call to it
explicitly here.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta-webserver/recipes-php/modphp/modphp5.inc      |    1 +
 meta-webserver/recipes-php/modphp/modphp_5.3.14.bb |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

Patch

diff --git a/meta-webserver/recipes-php/modphp/modphp5.inc b/meta-webserver/recipes-php/modphp/modphp5.inc
index 55e7c92..1db85bf 100644
--- a/meta-webserver/recipes-php/modphp/modphp5.inc
+++ b/meta-webserver/recipes-php/modphp/modphp5.inc
@@ -49,6 +49,7 @@  acpaths = ""
 # which breaks everything...
 #
 do_configure() {
+	gnu-configize --force
 	find . -name config.m4 -o -name configure | xargs -n1 sed -i 's!APXS_HTTPD=.*!APXS_HTTPD=${STAGING_BINDIR_NATIVE}/httpd!'
 	export PHP_LIBXML_DIR=${STAGING_DIR_NATIVE}${layout_exec_prefix} 
 	oe_runconf
diff --git a/meta-webserver/recipes-php/modphp/modphp_5.3.14.bb b/meta-webserver/recipes-php/modphp/modphp_5.3.14.bb
index a4011b6..2a264d7 100644
--- a/meta-webserver/recipes-php/modphp/modphp_5.3.14.bb
+++ b/meta-webserver/recipes-php/modphp/modphp_5.3.14.bb
@@ -1,5 +1,5 @@ 
 include modphp5.inc
-PR = "r2"
+PR = "r3"
 
 SRC_URI[md5sum] = "7caac4f71e2f21426c11ac153e538392"
 SRC_URI[sha256sum] = "c8075b6e83c5db0d26cc8426a7456856421089a76c963813b1fcac3ced041cb3"