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@linux.intel.com>
This commit is contained in:
Paul Eggleton
2014-12-31 15:26:44 +00:00
committed by Martin Jansa
parent ad6e018426
commit 18a97c00b7
4 changed files with 163 additions and 32 deletions
@@ -0,0 +1,12 @@
# vim: ft=apache sw=4 ts=4
<IfDefine PHP5>
# Load the module first
<IfModule !sapi_apache2.c>
LoadModule php5_module lib/apache2/modules/libphp5.so
</IfModule>
# Set it to handle the files
AddHandler php5-script .php .phtml .php3 .php4 .php5
AddType application/x-httpd-php-source .phps
DirectoryIndex index.html index.html.var index.php index.phtml
</IfDefine>
@@ -0,0 +1,11 @@
--- php-5.1.6/configure.old 2006-09-12 07:54:14.000000000 -0700
+++ php-5.1.6/configure 2006-09-12 07:54:37.000000000 -0700
@@ -14715,8 +14715,6 @@
- unset ac_cv_func_dlopen
- unset ac_cv_func___dlopen
unset found
echo $ac_n "checking for dlopen""... $ac_c" 1>&6
@@ -0,0 +1,30 @@
From d8067ceacbf54e79c9c6b68675332c09eaa0b55d Mon Sep 17 00:00:00 2001
From: Jackie Huang <jackie.huang@windriver.com>
Date: Mon, 8 Apr 2013 14:29:51 +0800
Subject: [PATCH] pthread-check
Enable pthreads support when cross-compiling
Upstream-Status: Inapproprate [config]
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
TSRM/threads.m4 | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/TSRM/threads.m4 b/TSRM/threads.m4
index 38494ce..15d9454 100644
--- a/TSRM/threads.m4
+++ b/TSRM/threads.m4
@@ -86,7 +86,7 @@ int main() {
pthreads_working=no
], [
dnl For cross compiling running this test is of no use. NetWare supports pthreads
- pthreads_working=no
+ pthreads_working=yes
case $host_alias in
*netware*)
pthreads_working=yes
--
1.7.4.1