Browse Source

php: Properly introduced the FPM patch for PHP.

user/karasz/test/ecn
Nagy Karoly Gabriel 15 years ago
parent
commit
4401ff6b82
  1. 5
      develop/php/config.hlp
  2. 2
      develop/php/config.in
  3. 33674
      develop/php/php-5.2.11-fpm-0.5.13.diff
  4. 16
      develop/php/php.conf

5
develop/php/config.hlp

@ -2,6 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# #
# Filename: package/.../php/config.hlp # Filename: package/.../php/config.hlp
# Copyright (C) 2010 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf # Copyright (C) 1998 - 2003 Clifford Wolf
# #
@ -20,3 +21,7 @@ SDECFG_PKG_PHP_FORCESHARED
Please check here if you want to use shared libraries instead of Please check here if you want to use shared libraries instead of
PHP's built-in support for various applications. PHP's built-in support for various applications.
SDECFG_PKG_PHP_FPM
Please check this if you want to apply the FPM patch which is
intended to build in PHP spawn-fcgi capabilities and other goodies.

2
develop/php/config.in

@ -2,6 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# #
# Filename: package/.../php/config.in # Filename: package/.../php/config.in
# Copyright (C) 2010 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf # Copyright (C) 1998 - 2003 Clifford Wolf
# #
@ -16,6 +17,7 @@
if pkgcheck php X ; then if pkgcheck php X ; then
menu_begin MENU_PKG_PHP 'PHP Package Options' menu_begin MENU_PKG_PHP 'PHP Package Options'
bool 'Force usage of shared modules' SDECFG_PKG_PHP_FORCESHARED 0 bool 'Force usage of shared modules' SDECFG_PKG_PHP_FORCESHARED 0
bool 'Enable FPM patch ' SDECFG_PKG_PHP_FPM 0
text 'Extra configure options' SDECFG_PKG_PHP_EXTRACONFOPT '' text 'Extra configure options' SDECFG_PKG_PHP_EXTRACONFOPT ''
menu_end menu_end
fi fi

33674
develop/php/php-5.2.11-fpm-0.5.13.diff

File diff suppressed because it is too large Load Diff

16
develop/php/php.conf

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# #
# Filename: package/.../php/php.conf # Filename: package/.../php/php.conf
# Copyright (C) 2006 - 2008 The OpenSDE Project # Copyright (C) 2006 - 2010 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf # Copyright (C) 1998 - 2003 Clifford Wolf
# #
@ -25,6 +25,9 @@ var_append confopt ' ' "--with-libdir=${libdir##*/}"
# global php.ini goes into sysconfdir # global php.ini goes into sysconfdir
var_append confopt ' ' "--with-config-file-path=$sysconfdir" var_append confopt ' ' "--with-config-file-path=$sysconfdir"
# sockets does not need any external lib. We have to enable it explicitly
var_append confopt ' ' "--enable-sockets"
if pkginstalled apache; then if pkginstalled apache; then
pkgprefix -t apache pkgprefix -t apache
var_append extraconfopt " " "--with-apxs2=$( pkgprefix sbindir apache )/apxs" var_append extraconfopt " " "--with-apxs2=$( pkgprefix sbindir apache )/apxs"
@ -98,6 +101,17 @@ if [ "$SDECFG_PKG_PHP_EXTRACONFOPT" ]; then
var_append extraconfopt " " "$SDECFG_PKG_PHP_EXTRACONFOPT" var_append extraconfopt " " "$SDECFG_PKG_PHP_EXTRACONFOPT"
fi fi
if [ "$SDECFG_PKG_PHP_FPM" ]; then
var_append extraconfopt " " "--enable-fpm"
fi
fpm_patch() {
if [ "$SDECFG_PKG_PHP_FPM" ]; then
var_append patchfiles "$confdir/php-5.2.11-fpm-0.5.13.diff"
fi
}
hook_add prepatch 5 'fpm_patch'
hook_add postmake 5 'cp php.ini-* $root$docdir' hook_add postmake 5 'cp php.ini-* $root$docdir'
# HACK ALERT # HACK ALERT

Loading…
Cancel
Save