[oe-commits] Paul Eggleton : php: integrate modphp

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: a9d50c25482013eeead3d607ab5b9af9d7dfc733
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=a9d50c25482013eeead3d607ab5b9af9d7dfc733

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Mon Jan  5 10:33:16 2015 +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>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.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=a9d50c25482013eeead3d607ab5b9af9d7dfc733