diff options
| author |   Jackie Huang <jackie.huang@windriver.com> | 2014-11-11 04:50:05 -0500 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2014-12-26 17:48:35 -0800 |
| commit | a88ed1d7a836b21c5af7320f95d72249e3ca2fcc (patch) | |
| tree | 23fc9453069a8e5007c9be739d58874073eacc1d /meta-oe | |
| parent | 4534f363651b332e611f1f3cd170e0e9379cfb52 (diff) | |
| download | meta-openembedded-a88ed1d7a836b21c5af7320f95d72249e3ca2fcc.tar.gz | |
rrdtool: inherit cpan-base to help build perl modules
It's incorrect to use -I for nativeperl to specify @INC/#include
directory to target build perl, which cause error like:
| temp/do_configure/run.do_configure.20749: line 112: 20256 Illegal instruction (core dumped)
| perl -I/path/to/tmp/sysroots/intel-haswell-64/usr/lib64/perl/$perl_version Makefile.PL
Inherit cpan-base and set related env vars to fix this and
avoid using sed to hack Makefile when build perl modules.
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe')
| -rw-r--r-- | meta-oe/recipes-extended/rrdtool/rrdtool_1.4.8.bb | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/meta-oe/recipes-extended/rrdtool/rrdtool_1.4.8.bb b/meta-oe/recipes-extended/rrdtool/rrdtool_1.4.8.bb index 449a923489..b901f2eb82 100644 --- a/meta-oe/recipes-extended/rrdtool/rrdtool_1.4.8.bb +++ b/meta-oe/recipes-extended/rrdtool/rrdtool_1.4.8.bb @@ -17,7 +17,7 @@ SRC_URI = "\ S = "${WORKDIR}/git" -inherit autotools-brokensep gettext pythonnative perlnative python-dir +inherit autotools-brokensep gettext pythonnative perlnative python-dir cpan-base EXTRA_AUTORECONF = "-I m4" @@ -56,6 +56,12 @@ export HOST_SYS export STAGING_LIBDIR export STAGING_INCDIR +# Env var which tells perl if it should use host (no) or target (yes) settings +export PERLCONFIGTARGET = "${@is_target(d)}" +export PERL_INC = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}/CORE" +export PERL_LIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}" +export PERL_ARCHLIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}" + do_configure() { #fix the pkglib problem with newer automake #perl @@ -71,9 +77,6 @@ do_configure() { autotools_do_configure - perl_version=`perl -v 2>/dev/null | \ - sed -n 's/This is perl.*v[a-z ]*\([0-9]\.[0-9][0-9.]*\).*$/\1/p'` - #modify python sitepkg #remove the dependency of perl-shared:Makefile #or perl-shared/Makefile will be regenerated @@ -86,13 +89,10 @@ do_configure() { #redo the perl bindings ( cd ${S}/bindings/perl-shared; - perl -I${STAGING_LIBDIR}/perl/$perl_version Makefile.PL INSTALLDIRS="vendor" - INSTALLPRIVLIB="abc"; - sed -i -e "s| ${libdir}/perl/| ${STAGING_LIBDIR}/perl/|g" Makefile; + perl Makefile.PL INSTALLDIRS="vendor" INSTALLPRIVLIB="abc"; cd ../../bindings/perl-piped; - perl -I${STAGING_LIBDIR}/perl/$perl_version Makefile.PL INSTALLDIRS="vendor"; - sed -i -e "s| ${libdir}/perl/| ${STAGING_LIBDIR}/perl/|g" Makefile; + perl Makefile.PL INSTALLDIRS="vendor"; ) #change the interpreter in file |