Commit Graph

21 Commits

Author SHA1 Message Date
Tom Rini 557884aeca 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>
2017-12-11 22:02:57 +00:00
Richard Purdie e0890b662e meta: Drop now pointless manual -dbg packaging
With the autodebug package generation logic, specifically setting FILES_${PN}-dbg
isn't needed in most cases, we can remove them.

(From OE-Core rev: 3ab59d49dd7c18e194b58d1248b4b87709b5a738)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-12-16 11:56:30 +00:00
Tyler Hall cf0dfdbcf8 classes/cpan-base: fix libdir for nativesdk
Immediate expansion of perl_get_libdirs() is too early for
BBCLASSEXTEND. This results in a packaging QA error when building a cpan
recipe as nativesdk. The split debug files do not get picked up by the
dbg package because it looks in the wrong libdir.

The is_target() function remains because it is used elsewhere.

(From OE-Core rev: b32420effcc0435353adc63023d2e4276dd1e0c6)

Signed-off-by: Tyler Hall <tylerwhall@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-11-24 15:50:27 +00:00
Jens Rehsack 2d0c4999a7 perl: fix Perl5 module builds
This patch fixes some issues in classes providing cpan module build support:

* add support even for xs modules with more than 3 levels as
  B::Hooks::End::Of::Scope or Math::Random::ISAAC::XS
* correct handling of Module::Build (as far as stolen from pkgsrc
  and my humble knowledge)
* configure to install to vendor_libs as default, even when
  inherited do_install remains unused (overwritten do_install)

(From OE-Core rev: 6948d2bd35cda57f520f0180a6bb43cc70262f41)

Signed-off-by: Jens Rehsack <sno@netbsd.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-10-29 07:31:17 +00:00
Paul Eggleton 2d05f5763c classes/cpan-base: fix signatures changing when perl is in sysroot
The previous fix for this same issue (OE-Core rev
f31f6a70ec24e8c9515d69c5092e15effc5e7d4d) was not sufficient - we are
setting the PERLVERSION variable from the get_perl_version function, but
we're setting it using immediate expansion; thus the value is going into
the signature and is still different between the time the recipe is
cached on an empty TMPDIR and after perl is in the sysroot and we run
bitbake -S perf. We could remove the immediate expansion, but that would
mean the get_perl_version function would be called more often, so just set
vardepvalue on the PERLVERSION variable to fix the problem instead.

(From OE-Core rev: 262a62dff2d7f0902d717c734fcf5563e96a38bc)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-02-17 15:28:58 +00:00
Martin Jansa c295fe6453 cpan-base: Add vardepvalue to get_perl_version function
* without this bitbake -S perf shows following error:
  ERROR: Bitbake's cached basehash does not match the one we just generated
    (/OE/oe-core/meta/recipes-kernel/perf/perf.bb.do_package)!
  if you run it twice, once without perl in sysroot and once with perl
  already built

(From OE-Core rev: f31f6a70ec24e8c9515d69c5092e15effc5e7d4d)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-12-05 14:25:27 +00:00
Richard Purdie 0ce97e5cba cpan-base.bbclass: Improve RDEPENDS to be package specific
(From OE-Core rev: 3300d5fdcc60b14e184e0c6c40ba25d8c4d5ed46)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-02-04 16:42:48 +00:00
Phil Blundell 9af29d8cb8 cpan-base: Add more debug paths to FILES
We seem to be mostly installing modules into vendor_perl nowadays.
Make sure that the .debug data from there is captured appropriately.

Also, expand ${PERLLIBDIRS} at the point of assignment so we don't
call the python again and again.

[RP: Fixup to whitespace]
(From OE-Core rev: ed7690bf5cc964b5cee55f5ef13c10c75d8e3463)

Signed-off-by: Phil Blundell <pb@pbcl.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-23 12:28:31 +01:00
Richard Purdie bfd279de32 Convert tab indentation in python functions into four-space
(From OE-Core rev: 604d46c686d06d62d5a07b9c7f4fa170f99307d8)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-19 10:24:50 +01:00
Richard Purdie b1aeaa8b0d meta: Replace bb.data.expand(xxx, d) -> d.expand(xxx)
sed \
 -e 's:bb.data.\(expand([^,()]*\), *\([^) ]*\) *):\2.\1):g' \
 -i `grep -ril bb.data.expand *`

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-05 10:23:53 -08:00
Richard Purdie 06f2f8ce0a meta: Convert getVar/getVarFlag(xxx, 1) -> (xxx, True)
Using "1" with getVar is bad coding style and "True" is preferred.
This patch is a sed over the meta directory of the form:

sed \
 -e 's:\(\.getVar([^,()]*, \)1 *):\1True):g' \
 -e 's:\(\.getVarFlag([^,()]*, [^,()]*, \)1 *):\1True):g' \
 -i `grep -ril getVar *`

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-05 10:22:56 -08:00
Richard Purdie c8dee9b92d Convert to use direct access to the data store (instead of bb.data.*Var*())
This is the result of running the following over the metadata:

sed \
-e 's:bb.data.\(setVar([^,()]*,[^,()]*\), *\([^ )]*\) *):\2.\1):g' \
-e 's:bb.data.\(setVarFlag([^,()]*,[^,()]*,[^,()]*\), *\([^) ]*\) *):\2.\1):g' \
-e 's:bb.data.\(getVar([^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \
-e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \
-e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^() ]*\) *):\2.\1):g' \
-e 's:bb.data.\(getVar([^,()]*\), *\([^) ]*\) *):\2.\1):g' \
-i `grep -ril bb.data *`

(From OE-Core rev: b22831fd63164c4db9c0b72934d7d734a6585251)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-10 11:51:19 +00:00
Dexuan Cui c13b10a6ae cpan.bbclass, cpan-base.bbclas: update them for the perlnative change
Since perl-native now populates into its own dir, here we need
change accordingly.

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
2011-06-09 16:58:34 +01:00
Nitin A Kamble 83796edd29 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>
2011-01-12 00:55:48 -08:00
Jingdong Lu 0d5e71e741 libxml-parser-perl: Fix bug of empty package of libxml-parser-perl.
Becaues of the error library path definition in cpan-base.class, libxml-parser-perl package is empty.

Signed-off-by: Jingdong Lu <jingdong.lu@windriver.com>
2010-12-10 23:13:00 +00:00
Nitin A Kamble 6915c7e8be cpan-base.bbclass: fix perl version finding function
Now perl version is in two digits like 12 in 5.12.1. Fix the old
function to work with multi digit version strings.

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
2010-07-16 16:38:12 +01:00
Richard Purdie ca5f36ee6a perl: Update from OE.dev and convert to use do_install for staging
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-11-18 20:05:55 +00:00
Richard Purdie 7acfa9467f perl: Standardise config.sh location
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-11-16 10:56:17 +00:00
Richard Purdie c54117458a classes: Remove and sanitise import statements
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-11-13 12:15:28 +00:00
Marcin Juszkiewicz 2aba13054a cpan-base.bbclass: Update the perl depenedencies: (from OE)
* For native modules DEPEND on perl-native and for others DEPEND on perl
  (which in turn depends on perl-native) rather then always depending on
  both perl and perl-native.
* Only RDEPEND for non-native modules rather then both native and non-native.

These changes are to allow you to build native modules without have to build
perl. Previously the dependencies would result in perl being built even
though it didn't actually need to. Thanks to hrw for pointing out what was
happening here.

Revision: 399705dfa7f6a6fd87366a6c0b1058354a5d4312
Ancestor: 5f43096a239a7ac66c7046feb414e8279db8f4bc
Author: lenehan@openembedded.org
Date: 2007-05-30T22:10:32
Branch: org.openembedded.dev

Modified files:
        classes/cpan-base.bbclass



git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3280 311d38ba-8fff-0310-9ca6-ca027cbcb966
2007-11-30 14:04:04 +00:00
Marcin Juszkiewicz 6c47cd48af cpan classes: sync Perl with OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1815 311d38ba-8fff-0310-9ca6-ca027cbcb966
2007-05-30 09:32:36 +00:00