diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-07-17 11:31:54 +0100 |
|---|---|---|
| committer | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-10-03 14:36:40 +0100 |
| commit | 418650c55d05724af398dc5fe1185b47bf788135 (patch) | |
| tree | 91df4cc563705266a7d590d38ac4dbd376114f84 /meta-webserver/recipes-php/modphp/files | |
| parent | 25ba859ab6ca18fb0391802a39300c408ab13420 (diff) | |
| download | meta-openembedded-contrib-418650c55d05724af398dc5fe1185b47bf788135.tar.gz | |
modphp: add from OE-Classic, update to 5.3.14 and fix
* Use working SRC_URI
* Fix to use correct headers and apxs script for cross-compiling
* Enable threading
* Install headers and scripts for building extension modules
* Use proper variables instead of /etc, /usr/lib etc.
* Fix rpath QA issues
* Add LIC_FILES_CHKSUM
* Put apache config file into SRC_URI instead of referring to it using
FILESDIR
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'meta-webserver/recipes-php/modphp/files')
3 files changed, 87 insertions, 0 deletions
diff --git a/meta-webserver/recipes-php/modphp/files/70_mod_php5.conf b/meta-webserver/recipes-php/modphp/files/70_mod_php5.conf new file mode 100644 index 0000000000..1de6fb11ac --- /dev/null +++ b/meta-webserver/recipes-php/modphp/files/70_mod_php5.conf @@ -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> diff --git a/meta-webserver/recipes-php/modphp/files/configure.patch b/meta-webserver/recipes-php/modphp/files/configure.patch new file mode 100644 index 0000000000..c5334c706e --- /dev/null +++ b/meta-webserver/recipes-php/modphp/files/configure.patch @@ -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 diff --git a/meta-webserver/recipes-php/modphp/files/pthread-check.patch b/meta-webserver/recipes-php/modphp/files/pthread-check.patch new file mode 100644 index 0000000000..1388b2b0bb --- /dev/null +++ b/meta-webserver/recipes-php/modphp/files/pthread-check.patch @@ -0,0 +1,64 @@ +Hack configure script so it does not disable pthread support when cross-compiling + +Upstream-Status: Inapproprate [config] + +Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> + +diff --git a/configure b/configure +index 03d8f95..6794d45 100755 +--- a/configure ++++ b/configure +@@ -3506,7 +3506,7 @@ fi + + if test "$cross_compiling" = yes; then + +- pthreads_working=no ++ pthreads_working=yes + case $host_alias in + *netware*) + pthreads_working=yes +@@ -3566,7 +3566,7 @@ else + + if test "$cross_compiling" = yes; then + +- pthreads_working=no ++ pthreads_working=yes + case $host_alias in + *netware*) + pthreads_working=yes +@@ -3636,7 +3636,7 @@ if test "$pthreads_working" != "yes"; then + + if test "$cross_compiling" = yes; then + +- pthreads_working=no ++ pthreads_working=yes + case $host_alias in + *netware*) + pthreads_working=yes +@@ -106833,7 +106833,7 @@ fi + + if test "$cross_compiling" = yes; then + +- pthreads_working=no ++ pthreads_working=yes + case $host_alias in + *netware*) + pthreads_working=yes +@@ -106893,7 +106893,7 @@ else + + if test "$cross_compiling" = yes; then + +- pthreads_working=no ++ pthreads_working=yes + case $host_alias in + *netware*) + pthreads_working=yes +@@ -106963,7 +106963,7 @@ if test "$pthreads_working" != "yes"; then + + if test "$cross_compiling" = yes; then + +- pthreads_working=no ++ pthreads_working=yes + case $host_alias in + *netware*) + pthreads_working=yes |