cpan-base.bbclass: Move PERLVERSION and get_perl_version to a new file
It is possible for non-CPAN recipes to contain perl modules. These perl modules must reside in the versioned perl library directory in order to work in normal circumstances.. Export this logic to a separate class so that it can be reused without the rest of the cpan logic. Without this, dpkg will not export its perl code to the correct location and will not be found by utilities that expect to use it. (From OE-Core rev: 6907280335dd47f2fd3a3f4cf809357c3caff65d) Signed-off-by: Tom Rini <trini@konsulko.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
b366f7eccc
commit
557884aeca
|
@ -7,27 +7,7 @@ FILES_${PN} += "${libdir}/perl ${datadir}/perl"
|
|||
DEPENDS += "${@["perl", "perl-native"][(bb.data.inherits_class('native', d))]}"
|
||||
RDEPENDS_${PN} += "${@["perl", ""][(bb.data.inherits_class('native', d))]}"
|
||||
|
||||
PERL_OWN_DIR = "${@["", "/perl-native"][(bb.data.inherits_class('native', d))]}"
|
||||
|
||||
# Determine the staged version of perl from the perl configuration file
|
||||
# Assign vardepvalue, because otherwise signature is changed before and after
|
||||
# perl is built (from None to real version in config.sh).
|
||||
get_perl_version[vardepvalue] = "${PERL_OWN_DIR}"
|
||||
def get_perl_version(d):
|
||||
import re
|
||||
cfg = d.expand('${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/config.sh')
|
||||
try:
|
||||
f = open(cfg, 'r')
|
||||
except IOError:
|
||||
return None
|
||||
l = f.readlines();
|
||||
f.close();
|
||||
r = re.compile("^version='(\d*\.\d*\.\d*)'")
|
||||
for s in l:
|
||||
m = r.match(s)
|
||||
if m:
|
||||
return m.group(1)
|
||||
return None
|
||||
inherit perl-version
|
||||
|
||||
def is_target(d):
|
||||
if not bb.data.inherits_class('native', d):
|
||||
|
@ -36,5 +16,3 @@ def is_target(d):
|
|||
|
||||
PERLLIBDIRS = "${libdir}/perl"
|
||||
PERLLIBDIRS_class-native = "${libdir}/perl-native"
|
||||
PERLVERSION := "${@get_perl_version(d)}"
|
||||
PERLVERSION[vardepvalue] = ""
|
||||
|
|
|
@ -0,0 +1,24 @@
|
|||
PERL_OWN_DIR = "${@["", "/perl-native"][(bb.data.inherits_class('native', d))]}"
|
||||
|
||||
# Determine the staged version of perl from the perl configuration file
|
||||
# Assign vardepvalue, because otherwise signature is changed before and after
|
||||
# perl is built (from None to real version in config.sh).
|
||||
get_perl_version[vardepvalue] = "${PERL_OWN_DIR}"
|
||||
def get_perl_version(d):
|
||||
import re
|
||||
cfg = d.expand('${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/config.sh')
|
||||
try:
|
||||
f = open(cfg, 'r')
|
||||
except IOError:
|
||||
return None
|
||||
l = f.readlines();
|
||||
f.close();
|
||||
r = re.compile("^version='(\d*\.\d*\.\d*)'")
|
||||
for s in l:
|
||||
m = r.match(s)
|
||||
if m:
|
||||
return m.group(1)
|
||||
return None
|
||||
|
||||
PERLVERSION := "${@get_perl_version(d)}"
|
||||
PERLVERSION[vardepvalue] = ""
|
Loading…
Reference in New Issue