[oe-commits] Paul Eggleton : php: integrate modphp
git at git.openembedded.org
git at git.openembedded.org
Thu Jan 8 11:20:46 UTC 2015
Module: meta-openembedded.git
Branch: master-next
Commit: 18a97c00b77bfc5eff2214f81934e0dd4d4954b9
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=18a97c00b77bfc5eff2214f81934e0dd4d4954b9
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date: Wed Dec 31 15:26:44 2014 +0000
php: integrate modphp
Build the mod_php Apache module within the main php recipe; this avoids
files in the sysroot from stepping on eachother and therefore avoids the
resulting build failure.
Changes made:
* Add an "apache2" PACKAGECONFIG, default disabled. This means that if
you previously used the modphp recipe you now need to set
PACKAGECONFIG for php to include "apache2".
* Bring in most patches and configure options from the modphp recipe.
* Specify ${libdir}/php5 as libdir. This avoids the PHP extensions
directory being /usr/lib/extensions by default which is ugly.
* Tidy up some superfluous/malformed entries in FILES_${PN}-pear
* Drop obsolete PHP_MAJVER
* Replace virtclass- override with class-
Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
---
meta-oe/recipes-devtools/php/php/70_mod_php5.conf | 12 ++
meta-oe/recipes-devtools/php/php/configure.patch | 11 ++
.../php/php/pthread-check-threads-m4.patch | 30 +++++
meta-oe/recipes-devtools/php/php_5.5.15.bb | 142 ++++++++++++++++-----
4 files changed, 163 insertions(+), 32 deletions(-)
Diff: http://git.openembedded.org/?p=meta-openembedded.git/?a=commitdiff;h=18a97c00b77bfc5eff2214f81934e0dd4d4954b9
More information about the Openembedded-commits
mailing list