diff options
author | Michael Cummings <mcummings@gentoo.org> | 2005-08-08 10:27:21 +0000 |
---|---|---|
committer | Michael Cummings <mcummings@gentoo.org> | 2005-08-08 10:27:21 +0000 |
commit | 1d1ea7153de83dbca9e583fd15a12c5ec2284083 (patch) | |
tree | 50109867fc45faca4f3ce854aff9a25acb619daf /www-apache | |
parent | Version bump (diff) | |
download | gentoo-2-1d1ea7153de83dbca9e583fd15a12c5ec2284083.tar.gz gentoo-2-1d1ea7153de83dbca9e583fd15a12c5ec2284083.tar.bz2 gentoo-2-1d1ea7153de83dbca9e583fd15a12c5ec2284083.zip |
bug 101292 - note for threaded vs unthreaded apache/perl systems
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'www-apache')
-rw-r--r-- | www-apache/mod_perl/ChangeLog | 6 | ||||
-rw-r--r-- | www-apache/mod_perl/Manifest | 12 | ||||
-rw-r--r-- | www-apache/mod_perl/mod_perl-2.0.1-r2.ebuild | 15 |
3 files changed, 20 insertions, 13 deletions
diff --git a/www-apache/mod_perl/ChangeLog b/www-apache/mod_perl/ChangeLog index 0ae8cd22cd3b..f45c56fa5685 100644 --- a/www-apache/mod_perl/ChangeLog +++ b/www-apache/mod_perl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-apache/mod_perl # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/ChangeLog,v 1.9 2005/08/08 09:38:32 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/ChangeLog,v 1.10 2005/08/08 10:27:21 mcummings Exp $ + + 08 Aug 2005; Michael Cummings <mcummings@gentoo.org> + mod_perl-2.0.1-r2.ebuild: + bug 101292 - note for threaded vs unthreaded apache/perl systems 08 Aug 2005; Michael Cummings <mcummings@gentoo.org> files/apache2-mod_perl-startup.pl: diff --git a/www-apache/mod_perl/Manifest b/www-apache/mod_perl/Manifest index 3520c7f6a852..c09143ab4030 100644 --- a/www-apache/mod_perl/Manifest +++ b/www-apache/mod_perl/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 0fe989294eba7b3f528afa4bd5509299 ChangeLog 10508 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305 MD5 03b7e719ebc03b0bbdb703ce809b510b mod_perl-1.27-r1.ebuild 1419 @@ -10,7 +7,7 @@ MD5 f0f522c1a4dfb370f786da11f0dd6ff1 mod_perl-1.29.ebuild 2114 MD5 7b6b1086e2c4a4e10caaddffb8c70c94 mod_perl-2.0.1-r1.ebuild 4826 MD5 8a3282dd3a16deb4647459f81ad70abe mod_perl-1.99.11.ebuild 3789 MD5 05f614537c52c42b923462192096468e mod_perl-1.99.16.ebuild 3804 -MD5 b2abdb1abcc3c0ce6f3a6277a08194d9 mod_perl-2.0.1-r2.ebuild 4826 +MD5 065e3ff91cacacc10d51d1aa152be9e3 mod_perl-2.0.1-r2.ebuild 5315 MD5 2415e6be73ba155382b34b5e2fad4951 files/75_mod_perl.conf 247 MD5 6dbf85f6df302959fc9decf11eb6e5f5 files/apache2-mod_perl-startup.pl 485 MD5 05455750ba5b64e18dbcfd113193e7cd files/digest-mod_perl-1.27-r1 65 @@ -26,10 +23,3 @@ MD5 300bce7b1dad6fda0b18cfdbf592a828 files/mod_perl-1.99.17-Apache2.pm 1149 MD5 8971805d7e08351fee8312e9f621398b files/digest-mod_perl-2.0.1-r2 67 MD5 39bbf08146125b9be7559d5c2d16b400 files/2.0.1/apache2-mod_perl-startup.pl 478 MD5 4dcf07748f65bc0682e4d739ec14535d files/2.0.1/75_mod_perl.conf 1527 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.0 (GNU/Linux) - -iD8DBQFC9ygqtG5z4I8BtQoRAo34AJ4o4AehpAJt2c/CUmYafpaYXsDGjwCfaKOS -HTmWmxaWKMw9Fu5jmrAurdU= -=BFYC ------END PGP SIGNATURE----- diff --git a/www-apache/mod_perl/mod_perl-2.0.1-r2.ebuild b/www-apache/mod_perl/mod_perl-2.0.1-r2.ebuild index bdf34746c95d..d58a0b013f85 100644 --- a/www-apache/mod_perl/mod_perl-2.0.1-r2.ebuild +++ b/www-apache/mod_perl/mod_perl-2.0.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/mod_perl-2.0.1-r2.ebuild,v 1.1 2005/08/08 09:35:43 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/mod_perl-2.0.1-r2.ebuild,v 1.2 2005/08/08 10:27:21 mcummings Exp $ inherit apache-module perl-module eutils DESCRIPTION="An embedded Perl interpreter for Apache2" @@ -27,6 +27,19 @@ DOCFILES="Changes INSTALL LICENSE README STATUS" APACHE2_MOD_DEFINE="PERL" src_unpack() { + INSTALLED_MPM="$(${ROOT}/usr/sbin/apxs2 -q MPM_NAME)" + eval `perl '-V:useithreads'` + ITHREADS="${useithreads}" + if [ "${INSTALLED_MPM}" != "prefork" ]; then + if [ "${ITHREADS}" == "undef" ]; then + ewarn "You cannot build mod_perl on a threaded apache" + ewarn "with an unthreaded perl. You must either emerge" + ewarn "perl with ithreads in your USE flags, or emerge" + ewarn "apache without threading support" + exit + fi + fi + unpack ${A} cd ${S} |