summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorXin Ouyang <Xin.Ouyang@windriver.com>2012-06-21 15:13:54 +0800
committerSaul Wold <sgw@linux.intel.com>2012-07-16 08:36:57 -0700
commit855211ae7a224f96663862d4a0e58a90d945dd48 (patch)
treec22efe8c24a39dabba796a753fc2abe8b92a3c9b /meta
parent8f30d41ede28a86564c402ce5b467e51aec6b15d (diff)
downloadopenembedded-core-855211ae7a224f96663862d4a0e58a90d945dd48.tar.gz
openembedded-core-855211ae7a224f96663862d4a0e58a90d945dd48.tar.bz2
openembedded-core-855211ae7a224f96663862d4a0e58a90d945dd48.zip
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. Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta')
-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 () {
test -f $f2 || continue
sed -i -e "s:\(PERL_ARCHLIB = \).*:\1${PERL_ARCHLIB}:" \
-e 's/perl.real/perl/' \
+ -e "s/^\(CCFLAGS =.*\)/\1 ${CFLAGS}/" \
$f2
done
fi
}
cpan_do_compile () {
- oe_runmake PASTHRU_INC="${CFLAGS}" CCFLAGS="${CFLAGS}" LD="${CCLD}"
+ oe_runmake PASTHRU_INC="${CFLAGS}" LD="${CCLD}"
}
cpan_do_install () {