summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2016-10-22 01:28:11 +0200
committerAndreas K. Hüttel <dilfridge@gentoo.org>2016-10-22 01:28:37 +0200
commit7cfe5d9a2c4b809fcfa9b48856adcc28c33e5d6b (patch)
tree3d43bad4e0215d942e368c4374a184a983ea4c6f /www-apache/mod_perl
parentsys-fs/lvm2: bump. (diff)
downloadgentoo-7cfe5d9a2c4b809fcfa9b48856adcc28c33e5d6b.tar.gz
gentoo-7cfe5d9a2c4b809fcfa9b48856adcc28c33e5d6b.tar.bz2
gentoo-7cfe5d9a2c4b809fcfa9b48856adcc28c33e5d6b.zip
www-apache/mod_perl: Better flag handling, force threading support on/off, bug 522698
Package-Manager: portage-2.3.2
Diffstat (limited to 'www-apache/mod_perl')
-rw-r--r--www-apache/mod_perl/metadata.xml5
-rw-r--r--www-apache/mod_perl/mod_perl-2.0.10_rc1-r1.ebuild (renamed from www-apache/mod_perl/mod_perl-2.0.10_rc1.ebuild)9
2 files changed, 9 insertions, 5 deletions
diff --git a/www-apache/mod_perl/metadata.xml b/www-apache/mod_perl/metadata.xml
index f75208ced86..28acd8c8093 100644
--- a/www-apache/mod_perl/metadata.xml
+++ b/www-apache/mod_perl/metadata.xml
@@ -5,8 +5,11 @@
<email>idl0r@gentoo.org</email>
<name>Christian Ruppert</name>
</maintainer>
-<maintainer type="project">
+ <maintainer type="project">
<email>perl@gentoo.org</email>
<name>Gentoo Perl Project</name>
</maintainer>
+ <use>
+ <flag name="ithreads">Build for use with thread-capable perl, needs same setting as in dev-lang/perl</flag>
+ </use>
</pkgmetadata>
diff --git a/www-apache/mod_perl/mod_perl-2.0.10_rc1.ebuild b/www-apache/mod_perl/mod_perl-2.0.10_rc1-r1.ebuild
index f1db3195b4d..3036d9f7fc5 100644
--- a/www-apache/mod_perl/mod_perl-2.0.10_rc1.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.10_rc1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dist.apache.org/repos/dist/dev/perl/mod_perl-2.0.10-rc1.tar.gz"
LICENSE="Apache-2.0"
SLOT="1"
KEYWORDS="~amd64 ~x86"
-IUSE="debug test apache2_mpms_event apache2_mpms_worker apache2_mpms_prefork"
+IUSE="debug ithreads test"
S=${WORKDIR}/${P/_rc1/-rc1}
@@ -29,11 +29,10 @@ SRC_TEST=do
# default one, which will likely need threading...
RDEPEND="
+ dev-lang/perl[ithreads=]
>=dev-perl/Apache-Test-1.400.0
>=www-servers/apache-2.0.47
- apache2_mpms_event? ( dev-lang/perl[ithreads] )
- apache2_mpms_worker? ( dev-lang/perl[ithreads] )
- !apache2_mpms_event? ( !apache2_mpms_worker? ( !apache2_mpms_prefork? ( dev-lang/perl[ithreads] ) ) )
+ !ithreads? ( www-servers/apache[-apache2_mpms_event,-apache2_mpms_worker,apache2_mpms_prefork] )
"
DEPEND="${RDEPEND}
dev-perl/Module-Build
@@ -74,12 +73,14 @@ src_prepare() {
src_configure() {
local debug=$(usex debug 1 0)
+ local nothreads=$(usex ithreads 0 1)
myconf=(
MP_USE_DSO=1
MP_APXS=${APXS}
MP_APR_CONFIG=/usr/bin/apr-1-config
MP_TRACE=${debug}
MP_DEBUG=${debug}
+ MP_NO_THREADS=${nothreads}
)
perl-module_src_configure