summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorXin Ouyang <Xin.Ouyang@windriver.com>2012-06-21 15:13:54 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-17 10:53:56 +0100
commita5bb0bdcf08c1f6e04118716ef1c5bb80f0b9f72 (patch)
tree66da48e9461b5fa1d97cfe671b5adcf47644c089 /meta/classes
parente789c1b406bf6400b74e0a492a601a7a6b6bb7fb (diff)
downloadpoky-a5bb0bdcf08c1f6e04118716ef1c5bb80f0b9f72.tar.gz
cpan.bbclass: Fix CCFLAGS.
We should not just replace CCFLAGS with CFLAGS while compiling, because this may cause run-time errors with perl's DynaLoader.pm. Tested on qemux86 with new libnet-libidn-perl bb recipe: root@qemux86:~# perl -e "use Net::LibIDN" Not a CODE reference at /usr/lib/perl/5.14.2//DynaLoader.pm line 213. END failed--call queue aborted at /usr/lib/perl/vendor_perl/5.14.2//Net/LibIDN.pm line 213. Compilation failed in require at -e line 1. BEGIN failed--compilation aborted at -e line 1. (From OE-Core rev: 855211ae7a224f96663862d4a0e58a90d945dd48) Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/cpan.bbclass3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/cpan.bbclass b/meta/classes/cpan.bbclass
index 2e9432c0bb..957a6e2bfa 100644
--- a/meta/classes/cpan.bbclass
+++ b/meta/classes/cpan.bbclass
@@ -26,13 +26,14 @@ cpan_do_configure () {
26 test -f $f2 || continue 26 test -f $f2 || continue
27 sed -i -e "s:\(PERL_ARCHLIB = \).*:\1${PERL_ARCHLIB}:" \ 27 sed -i -e "s:\(PERL_ARCHLIB = \).*:\1${PERL_ARCHLIB}:" \
28 -e 's/perl.real/perl/' \ 28 -e 's/perl.real/perl/' \
29 -e "s/^\(CCFLAGS =.*\)/\1 ${CFLAGS}/" \
29 $f2 30 $f2
30 done 31 done
31 fi 32 fi
32} 33}
33 34
34cpan_do_compile () { 35cpan_do_compile () {
35 oe_runmake PASTHRU_INC="${CFLAGS}" CCFLAGS="${CFLAGS}" LD="${CCLD}" 36 oe_runmake PASTHRU_INC="${CFLAGS}" LD="${CCLD}"
36} 37}
37 38
38cpan_do_install () { 39cpan_do_install () {