summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2011-01-27 15:53:47 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-27 11:25:17 +0000
commitb02a4addca8a4727767e24953b98f30399e3592b (patch)
treef5f357c97779e81e73a59e1cf58d57de4e0ec370
parentc34913ea5a4f20ce4bca3c68a65e9f64f1e3910c (diff)
downloadpoky-b02a4addca8a4727767e24953b98f30399e3592b.tar.gz
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>
-rw-r--r--meta/recipes-devtools/perl/perl_5.12.2.bb42
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() {
151} 151}
152 152
153do_compile() { 153do_compile() {
154 if test "${MACHINE}" != "native"; then 154 sed -i -e 's|/usr/include|${STAGING_INCDIR}|g' ext/Errno/Errno_pm.PL
155 sed -i -e 's|/usr/include|${STAGING_INCDIR}|g' ext/Errno/Errno_pm.PL 155 sed -i -e 's|/usr/include|${STAGING_INCDIR}|g' cpan/Compress-Raw-Zlib/config.in
156 sed -i -e 's|/usr/include|${STAGING_INCDIR}|g' cpan/Compress-Raw-Zlib/config.in 156 sed -i -e 's|/usr/lib|${STAGING_LIBDIR}|g' cpan/Compress-Raw-Zlib/config.in
157 sed -i -e 's|/usr/lib|${STAGING_LIBDIR}|g' cpan/Compress-Raw-Zlib/config.in
158 157
159 fi
160 cd Cross 158 cd Cross
161 oe_runmake perl LD="${CCLD}" 159 oe_runmake perl LD="${CCLD}"
162} 160}
@@ -186,24 +184,22 @@ PACKAGE_PREPROCESS_FUNCS += "perl_package_preprocess"
186 184
187perl_package_preprocess () { 185perl_package_preprocess () {
188 # Fix up installed configuration 186 # Fix up installed configuration
189 if test "${MACHINE}" != "native"; then 187 sed -i -e "s,${D},,g" \
190 sed -i -e "s,${D},,g" \ 188 -e "s,-isystem${STAGING_INCDIR} ,,g" \
191 -e "s,-isystem${STAGING_INCDIR} ,,g" \ 189 -e "s,${STAGING_LIBDIR},${libdir},g" \
192 -e "s,${STAGING_LIBDIR},${libdir},g" \ 190 -e "s,${STAGING_BINDIR},${bindir},g" \
193 -e "s,${STAGING_BINDIR},${bindir},g" \ 191 -e "s,${STAGING_INCDIR},${includedir},g" \
194 -e "s,${STAGING_INCDIR},${includedir},g" \ 192 -e "s,${STAGING_BINDIR_NATIVE}/,,g" \
195 -e "s,${STAGING_BINDIR_NATIVE}/,,g" \ 193 ${PKGD}${bindir}/h2xs \
196 ${PKGD}${bindir}/h2xs \ 194 ${PKGD}${bindir}/h2ph \
197 ${PKGD}${bindir}/h2ph \ 195 ${PKGD}${libdir}/perl/${PV}/pod/*.pod \
198 ${PKGD}${libdir}/perl/${PV}/pod/*.pod \ 196 ${PKGD}${libdir}/perl/${PV}/cacheout.pl \
199 ${PKGD}${libdir}/perl/${PV}/cacheout.pl \ 197 ${PKGD}${libdir}/perl/${PV}/FileCache.pm \
200 ${PKGD}${libdir}/perl/${PV}/FileCache.pm \ 198 ${PKGD}${libdir}/perl/config.sh \
201 ${PKGD}${libdir}/perl/config.sh \ 199 ${PKGD}${libdir}/perl/${PV}/Config.pm \
202 ${PKGD}${libdir}/perl/${PV}/Config.pm \ 200 ${PKGD}${libdir}/perl/${PV}/Config_heavy.pl \
203 ${PKGD}${libdir}/perl/${PV}/Config_heavy.pl \ 201 ${PKGD}${libdir}/perl/${PV}/CORE/perl.h \
204 ${PKGD}${libdir}/perl/${PV}/CORE/perl.h \ 202 ${PKGD}${libdir}/perl/${PV}/CORE/pp.h
205 ${PKGD}${libdir}/perl/${PV}/CORE/pp.h
206 fi
207} 203}
208 204
209PACKAGES = "perl-dbg perl perl-misc perl-dev perl-pod perl-doc perl-lib \ 205PACKAGES = "perl-dbg perl perl-misc perl-dev perl-pod perl-doc perl-lib \