Patchwork cpan-base: Add more debug paths to FILES

login
register
mail settings
Submitter Phil Blundell
Date Oct. 18, 2012, 10:19 p.m.
Message ID <1350598767.4470.179.camel@x121e.pbcl.net>
Download mbox | patch
Permalink /patch/38307/
State New
Headers show

Comments

Phil Blundell - Oct. 18, 2012, 10:19 p.m.
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.

Signed-off-by: Phil Blundell <pb@pbcl.net>
---
 meta/classes/cpan-base.bbclass |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
Martin Jansa - Oct. 18, 2012, 10:28 p.m.
On Thu, Oct 18, 2012 at 11:19:27PM +0100, Phil Blundell wrote:
> 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.
> 
> Signed-off-by: Phil Blundell <pb@pbcl.net>
> ---
>  meta/classes/cpan-base.bbclass |    9 +++++++--
>  1 files changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/classes/cpan-base.bbclass b/meta/classes/cpan-base.bbclass
> index 660c15f..cf697f1 100644
> --- a/meta/classes/cpan-base.bbclass
> +++ b/meta/classes/cpan-base.bbclass
> @@ -39,8 +39,13 @@ def is_target(d):
>          return "yes"
>      return "no"
>  
> -PERLLIBDIRS = "${@perl_get_libdirs(d)}"
> +PERLLIBDIRS := "${@perl_get_libdirs(d)}"
> +PERLVERSION := "${@get_perl_version(d)}"
>  
>  FILES_${PN}-dbg += "${PERLLIBDIRS}/auto/*/.debug \
>                      ${PERLLIBDIRS}/auto/*/*/.debug \
> -                    ${PERLLIBDIRS}/auto/*/*/*/.debug"
> +                    ${PERLLIBDIRS}/auto/*/*/*/.debug \
> +		    ${PERLLIBDIRS}/vendor_perl/${PERLVERSION}/auto/*/.debug \
> +		    ${PERLLIBDIRS}/vendor_perl/${PERLVERSION}/auto/*/*/.debug \
> +		    ${PERLLIBDIRS}/vendor_perl/${PERLVERSION}/auto/*/*/*/.debug \
> +		    "

Please don't mix tabs and spaces for indentation.
Saul Wold - Oct. 23, 2012, 7:02 p.m.
On 10/18/2012 03:19 PM, Phil Blundell wrote:
> 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.
>
> Signed-off-by: Phil Blundell <pb@pbcl.net>
> ---
>   meta/classes/cpan-base.bbclass |    9 +++++++--
>   1 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/meta/classes/cpan-base.bbclass b/meta/classes/cpan-base.bbclass
> index 660c15f..cf697f1 100644
> --- a/meta/classes/cpan-base.bbclass
> +++ b/meta/classes/cpan-base.bbclass
> @@ -39,8 +39,13 @@ def is_target(d):
>           return "yes"
>       return "no"
>
> -PERLLIBDIRS = "${@perl_get_libdirs(d)}"
> +PERLLIBDIRS := "${@perl_get_libdirs(d)}"
> +PERLVERSION := "${@get_perl_version(d)}"
>
>   FILES_${PN}-dbg += "${PERLLIBDIRS}/auto/*/.debug \
>                       ${PERLLIBDIRS}/auto/*/*/.debug \
> -                    ${PERLLIBDIRS}/auto/*/*/*/.debug"
> +                    ${PERLLIBDIRS}/auto/*/*/*/.debug \
> +		    ${PERLLIBDIRS}/vendor_perl/${PERLVERSION}/auto/*/.debug \
> +		    ${PERLLIBDIRS}/vendor_perl/${PERLVERSION}/auto/*/*/.debug \
> +		    ${PERLLIBDIRS}/vendor_perl/${PERLVERSION}/auto/*/*/*/.debug \
> +		    "
>
Merged into OE-Core (with whitespaces fixed)

Thanks
	Sau!

Patch

diff --git a/meta/classes/cpan-base.bbclass b/meta/classes/cpan-base.bbclass
index 660c15f..cf697f1 100644
--- a/meta/classes/cpan-base.bbclass
+++ b/meta/classes/cpan-base.bbclass
@@ -39,8 +39,13 @@  def is_target(d):
         return "yes"
     return "no"
 
-PERLLIBDIRS = "${@perl_get_libdirs(d)}"
+PERLLIBDIRS := "${@perl_get_libdirs(d)}"
+PERLVERSION := "${@get_perl_version(d)}"
 
 FILES_${PN}-dbg += "${PERLLIBDIRS}/auto/*/.debug \
                     ${PERLLIBDIRS}/auto/*/*/.debug \
-                    ${PERLLIBDIRS}/auto/*/*/*/.debug"
+                    ${PERLLIBDIRS}/auto/*/*/*/.debug \
+		    ${PERLLIBDIRS}/vendor_perl/${PERLVERSION}/auto/*/.debug \
+		    ${PERLLIBDIRS}/vendor_perl/${PERLVERSION}/auto/*/*/.debug \
+		    ${PERLLIBDIRS}/vendor_perl/${PERLVERSION}/auto/*/*/*/.debug \
+		    "