aboutsummaryrefslogtreecommitdiffstats
path: root/meta-webserver
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-10-15 13:38:51 +0100
committerPaul Eggleton <paul.eggleton@linux.intel.com>2012-10-18 11:44:56 +0100
commit6fe4073a2618c1c962972dc83523b72fc1d66e31 (patch)
tree2e106819b27ccf4d165ff76f63c5f67ded3e7f1e /meta-webserver
parentd9b7d6b4cd6b959b3998ddfec9775b64ffa61fe0 (diff)
downloadmeta-openembedded-6fe4073a2618c1c962972dc83523b72fc1d66e31.tar.gz
meta-openembedded-6fe4073a2618c1c962972dc83523b72fc1d66e31.tar.bz2
meta-openembedded-6fe4073a2618c1c962972dc83523b72fc1d66e31.zip
modphp: call gnu-configize in do_configure
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>
Diffstat (limited to 'meta-webserver')
-rw-r--r--meta-webserver/recipes-php/modphp/modphp5.inc1
-rw-r--r--meta-webserver/recipes-php/modphp/modphp_5.3.14.bb2
2 files changed, 2 insertions, 1 deletions
diff --git a/meta-webserver/recipes-php/modphp/modphp5.inc b/meta-webserver/recipes-php/modphp/modphp5.inc
index 55e7c925f..1db85bf2e 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 a4011b693..2a264d79a 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"