perl: Update cpan.bbclass to set CCFLAGS to CFLAGS so that the compiler

settings for the current OE build are used instead of the made up values in
the perl config (which were manually generated since we are cross
compiling). Remove this from each of the perl modules that was manually
setting this.

5 files changed, 4 insertions, 16 deletions

diff --git a/classes/cpan.bbclass b/classes/cpan.bbclass
index c48bd1a980..0b90e754df 100644
--- a/classes/cpan.bbclass
+++ b/classes/cpan.bbclass
@@ -17,7 +17,7 @@ cpan_do_configure () {
 }
 
 cpan_do_compile () {
-        oe_runmake PASTHRU_INC="${CFLAGS}"
+        oe_runmake PASTHRU_INC="${CFLAGS}" CCFLAGS="${CFLAGS}"
 }
 
 cpan_do_install () {
diff --git a/packages/perl/libcompress-zlib-perl_1.42.bb b/packages/perl/libcompress-zlib-perl_1.42.bb
index 1dce1bf325..c26678a9b9 100644
--- a/packages/perl/libcompress-zlib-perl_1.42.bb
+++ b/packages/perl/libcompress-zlib-perl_1.42.bb
@@ -9,6 +9,3 @@ SRC_URI = "http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/Compress-Zlib-1.42.t
 S = "${WORKDIR}/Compress-Zlib-${PV}"
 
 inherit cpan
-
-# Stop from searching /include - should put this in cpan class?
-export CCFLAGS = "${CFLAGS}"
diff --git a/packages/perl/libdigest-sha1-perl_2.11.bb b/packages/perl/libdigest-sha1-perl_2.11.bb
index 912fdb1843..712c0e6737 100644
--- a/packages/perl/libdigest-sha1-perl_2.11.bb
+++ b/packages/perl/libdigest-sha1-perl_2.11.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Digest::SHA1 - Perl interface to the SHA-1 algorithm"
 SECTION = "libs"
 MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE = "Artistic"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/Digest-SHA1-2.11.tar.gz"
 
@@ -14,6 +14,3 @@ FILES_${PN} = "${libdir}/perl5/*/*/auto/Digest/SHA1/* \
                 ${libdir}/perl5/*/*/auto/Digest/SHA1/.packlist \
                 ${libdir}/perl5/*/*/Digest"
 FILES_${PN}-dbg += "${libdir}/perl5/*/*/auto/Digest/SHA1/.debug"
-
-# Stop from searching /include - should put this in cpan class?
-export CCFLAGS = "${CFLAGS}"
diff --git a/packages/perl/libipc-sharelite-perl_0.09.bb b/packages/perl/libipc-sharelite-perl_0.09.bb
index 5598eed93e..6e2c7f16e3 100644
--- a/packages/perl/libipc-sharelite-perl_0.09.bb
+++ b/packages/perl/libipc-sharelite-perl_0.09.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "IPC::ShareLite - Light-weight interface to shared memory"
 SECTION = "libs"
 MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE = "Artistic"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MA/MAURICE/IPC-ShareLite-0.09.tar.gz"
 
@@ -14,6 +14,3 @@ FILES_${PN} = "${libdir}/perl5/*/*/auto/IPC/ShareLite/* \
                 ${libdir}/perl5/*/*/auto/IPC/ShareLite/.packlist \
                 ${libdir}/perl5/*/*/IPC"
 FILES_${PN}-dbg += "${libdir}/perl5/*/*/auto/IPC/ShareLite/.debug"
-
-# Stop from searching /include - should put this in cpan class?
-export CCFLAGS = "${CFLAGS}"
diff --git a/packages/perl/libparams-validate-perl_0.86.bb b/packages/perl/libparams-validate-perl_0.86.bb
index 75894af662..cd628f4809 100644
--- a/packages/perl/libparams-validate-perl_0.86.bb
+++ b/packages/perl/libparams-validate-perl_0.86.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Params::Validate - Validate method/function parameters"
 SECTION = "libs"
 MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE = "Artistic"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Params-Validate-0.86.tar.gz"
 
@@ -15,6 +15,3 @@ FILES_${PN} = "${libdir}/perl5/*/*/auto/Params/Validate/* \
                 ${libdir}/perl5/*/*/Params \
                 ${libdir}/perl5/*/*/Attribute"
 FILES_${PN}-dbg += "${libdir}/perl5/*/*/auto/Params/Validate/.debug"
-
-# Stop from searching /include - should put this in cpan class?
-export CCFLAGS = "${CFLAGS}"