summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorMichael Cummings <mcummings@gentoo.org>2004-04-02 10:22:50 +0000
committerMichael Cummings <mcummings@gentoo.org>2004-04-02 10:22:50 +0000
commit7ff0f2ddc8c1e67ce316bd5290fdbaa6c24c6928 (patch)
tree4336974269e7f02a73ea1bde49e93dccc885da40 /eclass
parentInitial import. Fixes #46413. (Manifest recommit) (diff)
downloadgentoo-2-7ff0f2ddc8c1e67ce316bd5290fdbaa6c24c6928.tar.gz
gentoo-2-7ff0f2ddc8c1e67ce316bd5290fdbaa6c24c6928.tar.bz2
gentoo-2-7ff0f2ddc8c1e67ce316bd5290fdbaa6c24c6928.zip
Should fix Mr.Bones/Carpaski's concerns about how perl vars are generated during cacheing
Diffstat (limited to 'eclass')
-rw-r--r--eclass/perl-module.eclass31
1 files changed, 13 insertions, 18 deletions
diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
index d2e6c15f99d5..e8eadb219082 100644
--- a/eclass/perl-module.eclass
+++ b/eclass/perl-module.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/perl-module.eclass,v 1.57 2004/03/05 10:30:33 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/perl-module.eclass,v 1.58 2004/04/02 10:22:50 mcummings Exp $
#
# Author: Seemant Kulleen <seemant@gentoo.org>
# Maintained by the Perl herd <perl@gentoo.org>
@@ -27,23 +27,6 @@ ARCH_LIB=""
POD_DIR=""
MMSIXELEVEN=""
-getperlinfo() {
- eval `perl '-V:version'`
- PERL_VERSION=${version}
- eval `perl '-V:installsitearch'`
- SITE_ARCH=${installsitearch}
- eval `perl '-V:installarchlib'`
- ARCH_LIB=${installarchlib}
- eval `perl '-V:installarchlib'`
- ARCH_LIB=${installarchlib}
- eval `perl '-V:installsitearch'`
- SITE_LIB=${installsitearch}
-# handling of DESTDIR changed in makemaker 6.11
- MMSIXELEVEN=`perl -e 'use ExtUtils::MakeMaker; print( $ExtUtils::MakeMaker::VERSION ge "6.11" )'`
-}
-
-getperlinfo
-
perl-module_src_prep() {
SRC_PREP="yes"
if [ "${style}" == "builder" ]; then
@@ -184,6 +167,18 @@ perlinfo() {
then
POD_DIR="/usr/share/perl/gentoo-pods/${version}"
fi
+ eval `perl '-V:version'`
+ PERL_VERSION=${version}
+ eval `perl '-V:installsitearch'`
+ SITE_ARCH=${installsitearch}
+ eval `perl '-V:installarchlib'`
+ ARCH_LIB=${installarchlib}
+ eval `perl '-V:installarchlib'`
+ ARCH_LIB=${installarchlib}
+ eval `perl '-V:installsitearch'`
+ SITE_LIB=${installsitearch}
+# handling of DESTDIR changed in makemaker 6.11
+ MMSIXELEVEN=`perl -e 'use ExtUtils::MakeMaker; print( $ExtUtils::MakeMaker::VERSION ge "6.11" )'`
}