diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2003-05-14 20:09:02 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2003-05-14 20:09:02 +0000 |
| commit | 41bd30e59ae913acd05d025b53202d11863258a5 (patch) | |
| tree | 3c4117f84d9c83b3da7da3fe361240345974797a /dev-php | |
| parent | initial (diff) | |
| download | historical-41bd30e59ae913acd05d025b53202d11863258a5.tar.gz historical-41bd30e59ae913acd05d025b53202d11863258a5.tar.bz2 historical-41bd30e59ae913acd05d025b53202d11863258a5.zip | |
Ensure ZTS is used for some Apache2 MPMs.
Diffstat (limited to 'dev-php')
| -rw-r--r-- | dev-php/mod_php/ChangeLog | 3 | ||||
| -rw-r--r-- | dev-php/mod_php/Manifest | 4 | ||||
| -rw-r--r-- | dev-php/mod_php/mod_php-4.3.1-r3.ebuild | 22 |
3 files changed, 17 insertions, 12 deletions
diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog index df329ac330dc..9ff6a580e04f 100644 --- a/dev-php/mod_php/ChangeLog +++ b/dev-php/mod_php/ChangeLog @@ -1,12 +1,13 @@ # ChangeLog for dev-php/mod_php # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.65 2003/05/14 10:17:20 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.66 2003/05/14 20:08:59 robbat2 Exp $ *mod_php-4.3.1-r3 (23 Apr 2003) 14 May 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.1-r3.ebuild: Fix symlink for /etc/php4/lib under Apache2. Thanks to Bluesman <bluesman@byteme.no> on IRC. Fixed ACCEPT_KEYWORDS and RDEPEND. + Ensure ZTS is used for some Apache2 MPMs. 13 May 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.1-r3.ebuild: More cleanups, nearly ready for ~x86. diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest index 225abdf7f246..2c16e17ffd0e 100644 --- a/dev-php/mod_php/Manifest +++ b/dev-php/mod_php/Manifest @@ -1,9 +1,9 @@ -MD5 f62092111f81d337bef17eca4d79abd5 mod_php-4.3.1-r3.ebuild 2405 +MD5 9b5416f0ed508853611588a3de6469c6 mod_php-4.3.1-r3.ebuild 2574 MD5 8a10662c67b87c1c40d3eedb598280bf mod_php-4.3.1.ebuild 8922 MD5 c99a00bf82ec9a082399ab1dd931c415 mod_php-4.3.1-r2.ebuild 9241 MD5 6de98d80b82a71ed8845884b0bd5676e mod_php-4.2.3-r2.ebuild 8071 MD5 dfc6bd16160024127fa9b0c242fc8ab5 mod_php-4.3.0-r2.ebuild 8634 -MD5 811ef67e1297af4a2ceec38baea0aa98 ChangeLog 15195 +MD5 8441eb3e6c01474e2d5a2fbdccf98080 ChangeLog 15239 MD5 c585d6d5154fe64839f25db957301433 mod_php-4.3.1-r1.ebuild 9135 MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148 MD5 6cf293d9a0faa0e7e5d86d9fd2d47131 files/70_mod_php.conf 329 diff --git a/dev-php/mod_php/mod_php-4.3.1-r3.ebuild b/dev-php/mod_php/mod_php-4.3.1-r3.ebuild index a49d076454e6..d87beaa41397 100644 --- a/dev-php/mod_php/mod_php-4.3.1-r3.ebuild +++ b/dev-php/mod_php/mod_php-4.3.1-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.1-r3.ebuild,v 1.7 2003/05/14 10:17:20 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.1-r3.ebuild,v 1.8 2003/05/14 20:08:59 robbat2 Exp $ inherit php eutils @@ -10,25 +10,29 @@ DESCRIPTION="Apache module for PHP" KEYWORDS="~x86 ~sparc ~ppc ~alpha ~hppa ~arm ~sparc" SLOT="0" - # users have been having problems with compiling the gmp support... disabled for now - # - rphillips - #>=dev-libs/gmp-3.1.1 - DEPEND="${DEPEND} || ( apache2? ( >=net-www/apache-2.0.43-r1 ) >=net-www/apache-1.3.26-r2 - ) - " + )" src_compile() { #no readline on server SAPI myconf="${myconf} --without-readline " + # Every Apache2 MPM EXCEPT prefork needs Zend Thread Safety + if [ "`use apache2`" ]; then + APACHE2_MPM="`apache2 -l |egrep 'worker|prechild|leader|threadpool|prefork'|xargs|cut -d. -f1`" + case "${APACHE2_MPM}" in + prefork) ;; + *) myconf="${myconf} --enable-experimental-zts" ;; + esac; + fi + # optional support for apache2 use apache2 \ - && myconf="${myconf} --with-apxs2=/usr/sbin/apxs2" \ - || myconf="${myconf} --with-apxs=/usr/sbin/apxs" + && myconf="${myconf} --with-apxs2=/usr/sbin/apxs2" \ + || myconf="${myconf} --with-apxs=/usr/sbin/apxs" #php CGI stuff #--enable-discard-path --enable-force-cgi-redirect |