summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2010-12-30 12:27:54 -0800
committerSaul Wold <sgw@linux.intel.com>2011-01-12 00:55:48 -0800
commit83796edd29561f02b6f7b036351711f8def77a4f (patch)
tree6a71cc0f9a71c3c14a0557bab12f1859830909b3 /meta
parentf57e9daf74d5fbab6c9a3f5e60e1320a0bf0642d (diff)
downloadopenembedded-core-83796edd29561f02b6f7b036351711f8def77a4f.tar.gz
openembedded-core-83796edd29561f02b6f7b036351711f8def77a4f.tar.bz2
openembedded-core-83796edd29561f02b6f7b036351711f8def77a4f.tar.xz
openembedded-core-83796edd29561f02b6f7b036351711f8def77a4f.zip
cpan.bbclass: use LIBDIR instead of DATADIR
perl 5.12.2 does not use /usr/share/perl path, and all that stuff goes in /usr/lib/perl. This commit fixes cpan class which depends on /usr/share/perl. cpan.base/build.bbclass: change /usr/lib/perl5 to /usr/lib/perl Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/cpan-base.bbclass4
-rw-r--r--meta/classes/cpan.bbclass2
-rw-r--r--meta/classes/cpan_build.bbclass4
3 files changed, 5 insertions, 5 deletions
diff --git a/meta/classes/cpan-base.bbclass b/meta/classes/cpan-base.bbclass
index 1d13ff3f0..6cd2aa340 100644
--- a/meta/classes/cpan-base.bbclass
+++ b/meta/classes/cpan-base.bbclass
@@ -2,7 +2,7 @@
# cpan-base providers various perl related information needed for building
# cpan modules
#
-FILES_${PN} += "${libdir}/perl5 ${datadir}/perl5"
+FILES_${PN} += "${libdir}/perl ${datadir}/perl"
DEPENDS += "${@["perl", "perl-native"][(bb.data.inherits_class('native', d))]}"
RDEPENDS += "${@["perl", ""][(bb.data.inherits_class('native', d))]}"
@@ -27,7 +27,7 @@ def get_perl_version(d):
# Determine where the library directories are
def perl_get_libdirs(d):
libdir = bb.data.getVar('libdir', d, 1)
- libdirs = libdir + '/perl5'
+ libdirs = libdir + '/perl'
return libdirs
def is_target(d):
diff --git a/meta/classes/cpan.bbclass b/meta/classes/cpan.bbclass
index 513f0b3ce..05f2374f4 100644
--- a/meta/classes/cpan.bbclass
+++ b/meta/classes/cpan.bbclass
@@ -10,7 +10,7 @@ export PERLCONFIGTARGET = "${@is_target(d)}"
# Env var which tells perl where the perl include files are
export PERL_INC = "${STAGING_LIBDIR}/perl/${@get_perl_version(d)}/CORE"
-export PERL_LIB = "${STAGING_DATADIR}/perl/${@get_perl_version(d)}"
+export PERL_LIB = "${STAGING_LIBDIR}/perl/${@get_perl_version(d)}"
export PERL_ARCHLIB = "${STAGING_LIBDIR}/perl/${@get_perl_version(d)}"
cpan_do_configure () {
diff --git a/meta/classes/cpan_build.bbclass b/meta/classes/cpan_build.bbclass
index dd8d5434d..cc503a424 100644
--- a/meta/classes/cpan_build.bbclass
+++ b/meta/classes/cpan_build.bbclass
@@ -26,8 +26,8 @@ cpan_build_do_configure () {
perl Build.PL --installdirs vendor \
--destdir ${D} \
- --install_path lib="${datadir}/perl5" \
- --install_path arch="${libdir}/perl5" \
+ --install_path lib="${datadir}/perl" \
+ --install_path arch="${libdir}/perl" \
--install_path script=${bindir} \
--install_path bin=${bindir} \
--install_path bindoc=${mandir}/man1 \