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>
This commit is contained in:
parent
f57e9daf74
commit
83796edd29
|
@ -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):
|
||||
|
|
|
@ -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 () {
|
||||
|
|
|
@ -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 \
|
||||
|
|
Loading…
Reference in New Issue