[arch-commits] Commit in php/trunk (PKGBUILD)

[Pierre Schmitz]

    Date: Thursday, February 27, 2014 @ 12:47:10
  Author: pierre
Revision: 206470

Apache 2.4 rebuild

Also force build of the non-ZTS build regardless of the currently configured Apache MPM.

Modified:
  php/trunk/PKGBUILD

----------+
 PKGBUILD |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-02-27 10:35:34 UTC (rev 206469)
+++ PKGBUILD	2014-02-27 11:47:10 UTC (rev 206470)
@@ -22,7 +22,7 @@
          'php-tidy'
          'php-xsl')
 pkgver=5.5.9
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('PHP')
 url='http://www.php.net'
@@ -48,6 +48,9 @@
 
 	patch -p0 -i ${srcdir}/php.ini.patch
 	patch -p0 -i ${srcdir}/php-fpm.conf.in.patch
+	# Just because our Apache 2.4 is configured with a threaded MPM by default does not mean we want to build a ZTS PHP.
+	# Let's supress this behaviour and build a SAPI that works fine with the prefork MPM.
+	sed '/APACHE_THREADED_MPM=/d' -i sapi/apache2handler/config.m4 -i configure
 }
 
 build() {
@@ -198,7 +201,8 @@
 # 	cd ${srcdir}/build-php
 # 	export SNMP_TIMEOUT=1
 # 	export SNMP_RETRIES=0
-# 	printf "n\n" | make test
+# 	export NO_INTERACTION=1
+# 	make test
 # 	echo
 # }