mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 13:29:49 +00:00
Code Issues Projects Releases Wiki Activity

perl: Remove ${MACHINE} dependency in compile and package.

Browse Source 
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>
This commit is contained in:
Dongxiao Xu
2011-01-27 15:53:47 +08:00
committed by Richard Purdie
parent c34913ea5a
commit b02a4addca
1 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-devtools/perl/perl_5.12.2.bb
+19 -23
View File
@@ -151,12 +151,10 @@ do_configure() {
} }
do_compile() { 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' 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/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/lib|${STAGING_LIBDIR}|g' cpan/Compress-Raw-Zlib/config.in
fi
cd Cross cd Cross
oe_runmake perl LD="${CCLD}" oe_runmake perl LD="${CCLD}"
} }
@@ -186,24 +184,22 @@ PACKAGE_PREPROCESS_FUNCS += "perl_package_preprocess"
perl_package_preprocess () { perl_package_preprocess () {
# Fix up installed configuration # Fix up installed configuration
if test "${MACHINE}" != "native"; then sed -i -e "s,${D},,g" \
sed -i -e "s,${D},,g" \ -e "s,-isystem${STAGING_INCDIR} ,,g" \
-e "s,-isystem${STAGING_INCDIR} ,,g" \ -e "s,${STAGING_LIBDIR},${libdir},g" \
-e "s,${STAGING_LIBDIR},${libdir},g" \ -e "s,${STAGING_BINDIR},${bindir},g" \
-e "s,${STAGING_BINDIR},${bindir},g" \ -e "s,${STAGING_INCDIR},${includedir},g" \
-e "s,${STAGING_INCDIR},${includedir},g" \ -e "s,${STAGING_BINDIR_NATIVE}/,,g" \
-e "s,${STAGING_BINDIR_NATIVE}/,,g" \ ${PKGD}${bindir}/h2xs \
${PKGD}${bindir}/h2xs \ ${PKGD}${bindir}/h2ph \
${PKGD}${bindir}/h2ph \ ${PKGD}${libdir}/perl/${PV}/pod/*.pod \
${PKGD}${libdir}/perl/${PV}/pod/*.pod \ ${PKGD}${libdir}/perl/${PV}/cacheout.pl \
${PKGD}${libdir}/perl/${PV}/cacheout.pl \ ${PKGD}${libdir}/perl/${PV}/FileCache.pm \
${PKGD}${libdir}/perl/${PV}/FileCache.pm \ ${PKGD}${libdir}/perl/config.sh \
${PKGD}${libdir}/perl/config.sh \ ${PKGD}${libdir}/perl/${PV}/Config.pm \
${PKGD}${libdir}/perl/${PV}/Config.pm \ ${PKGD}${libdir}/perl/${PV}/Config_heavy.pl \
${PKGD}${libdir}/perl/${PV}/Config_heavy.pl \ ${PKGD}${libdir}/perl/${PV}/CORE/perl.h \
${PKGD}${libdir}/perl/${PV}/CORE/perl.h \ ${PKGD}${libdir}/perl/${PV}/CORE/pp.h
${PKGD}${libdir}/perl/${PV}/CORE/pp.h
fi
} }
PACKAGES = "perl-dbg perl perl-misc perl-dev perl-pod perl-doc perl-lib \ PACKAGES = "perl-dbg perl perl-misc perl-dev perl-pod perl-doc perl-lib \