diff options
| author | Dongxiao Xu <dongxiao.xu@intel.com> | 2011-01-27 15:53:47 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-27 11:25:17 +0000 |
| commit | b02a4addca8a4727767e24953b98f30399e3592b (patch) | |
| tree | f5f357c97779e81e73a59e1cf58d57de4e0ec370 /meta | |
| parent | c34913ea5a4f20ce4bca3c68a65e9f64f1e3910c (diff) | |
| download | openembedded-core-b02a4addca8a4727767e24953b98f30399e3592b.tar.gz openembedded-core-b02a4addca8a4727767e24953b98f30399e3592b.tar.bz2 openembedded-core-b02a4addca8a4727767e24953b98f30399e3592b.zip | |
perl: Remove ${MACHINE} dependency in compile and package.
The judgement on ${MACHINE} is meaningless, remove it in order to avoid
being rebuild on second machine.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-devtools/perl/perl_5.12.2.bb | 42 |
1 files changed, 19 insertions, 23 deletions
diff --git a/meta/recipes-devtools/perl/perl_5.12.2.bb b/meta/recipes-devtools/perl/perl_5.12.2.bb index e7e1cb4dd4..82801e8694 100644 --- a/meta/recipes-devtools/perl/perl_5.12.2.bb +++ b/meta/recipes-devtools/perl/perl_5.12.2.bb @@ -151,12 +151,10 @@ do_configure() { } do_compile() { - if test "${MACHINE}" != "native"; then - sed -i -e 's|/usr/include|${STAGING_INCDIR}|g' ext/Errno/Errno_pm.PL - sed -i -e 's|/usr/include|${STAGING_INCDIR}|g' cpan/Compress-Raw-Zlib/config.in - sed -i -e 's|/usr/lib|${STAGING_LIBDIR}|g' cpan/Compress-Raw-Zlib/config.in + sed -i -e 's|/usr/include|${STAGING_INCDIR}|g' ext/Errno/Errno_pm.PL + sed -i -e 's|/usr/include|${STAGING_INCDIR}|g' cpan/Compress-Raw-Zlib/config.in + sed -i -e 's|/usr/lib|${STAGING_LIBDIR}|g' cpan/Compress-Raw-Zlib/config.in - fi cd Cross oe_runmake perl LD="${CCLD}" } @@ -186,24 +184,22 @@ PACKAGE_PREPROCESS_FUNCS += "perl_package_preprocess" perl_package_preprocess () { # Fix up installed configuration - if test "${MACHINE}" != "native"; then - sed -i -e "s,${D},,g" \ - -e "s,-isystem${STAGING_INCDIR} ,,g" \ - -e "s,${STAGING_LIBDIR},${libdir},g" \ - -e "s,${STAGING_BINDIR},${bindir},g" \ - -e "s,${STAGING_INCDIR},${includedir},g" \ - -e "s,${STAGING_BINDIR_NATIVE}/,,g" \ - ${PKGD}${bindir}/h2xs \ - ${PKGD}${bindir}/h2ph \ - ${PKGD}${libdir}/perl/${PV}/pod/*.pod \ - ${PKGD}${libdir}/perl/${PV}/cacheout.pl \ - ${PKGD}${libdir}/perl/${PV}/FileCache.pm \ - ${PKGD}${libdir}/perl/config.sh \ - ${PKGD}${libdir}/perl/${PV}/Config.pm \ - ${PKGD}${libdir}/perl/${PV}/Config_heavy.pl \ - ${PKGD}${libdir}/perl/${PV}/CORE/perl.h \ - ${PKGD}${libdir}/perl/${PV}/CORE/pp.h - fi + sed -i -e "s,${D},,g" \ + -e "s,-isystem${STAGING_INCDIR} ,,g" \ + -e "s,${STAGING_LIBDIR},${libdir},g" \ + -e "s,${STAGING_BINDIR},${bindir},g" \ + -e "s,${STAGING_INCDIR},${includedir},g" \ + -e "s,${STAGING_BINDIR_NATIVE}/,,g" \ + ${PKGD}${bindir}/h2xs \ + ${PKGD}${bindir}/h2ph \ + ${PKGD}${libdir}/perl/${PV}/pod/*.pod \ + ${PKGD}${libdir}/perl/${PV}/cacheout.pl \ + ${PKGD}${libdir}/perl/${PV}/FileCache.pm \ + ${PKGD}${libdir}/perl/config.sh \ + ${PKGD}${libdir}/perl/${PV}/Config.pm \ + ${PKGD}${libdir}/perl/${PV}/Config_heavy.pl \ + ${PKGD}${libdir}/perl/${PV}/CORE/perl.h \ + ${PKGD}${libdir}/perl/${PV}/CORE/pp.h } PACKAGES = "perl-dbg perl perl-misc perl-dev perl-pod perl-doc perl-lib \ |