diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2011-09-21 20:47:03 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-22 05:06:59 +0100 |
commit | 0f6ef5cc921fd2aff5113207cc3b49cd22507b11 (patch) | |
tree | 3bdfec9e27e9c6621a9a7c776a8c43315aa02c11 /meta | |
parent | 7f59cbceb429269ebd77d3e3c40df1dd9e7b1c65 (diff) | |
download | poky-0f6ef5cc921fd2aff5113207cc3b49cd22507b11.tar.gz |
perl: Fix a few perl binaries to use target interpreter paths
A small number of target installed programs, "${bindir}/pod*",
were incorrectly using the perl-native paths to access perl. This
caused a dependency failure during RPM rootfs install, and also
prevented those specific components from functioning.
(From OE-Core rev: 7b8db36e088e3e9cd585e8d8dde1c1c2860c3c2e)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/perl/perl_5.12.3.bb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/meta/recipes-devtools/perl/perl_5.12.3.bb b/meta/recipes-devtools/perl/perl_5.12.3.bb index d28656486a..e4769a4235 100644 --- a/meta/recipes-devtools/perl/perl_5.12.3.bb +++ b/meta/recipes-devtools/perl/perl_5.12.3.bb | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \ | |||
7 | # We need gnugrep (for -I) | 7 | # We need gnugrep (for -I) |
8 | DEPENDS = "virtual/db grep-native" | 8 | DEPENDS = "virtual/db grep-native" |
9 | DEPENDS += "gdbm zlib" | 9 | DEPENDS += "gdbm zlib" |
10 | PR = "r4" | 10 | PR = "r5" |
11 | 11 | ||
12 | # 5.10.1 has Module::Build built-in | 12 | # 5.10.1 has Module::Build built-in |
13 | PROVIDES += "libmodule-build-perl" | 13 | PROVIDES += "libmodule-build-perl" |
@@ -216,9 +216,17 @@ perl_package_preprocess () { | |||
216 | -e "s,${STAGING_LIBDIR},${libdir},g" \ | 216 | -e "s,${STAGING_LIBDIR},${libdir},g" \ |
217 | -e "s,${STAGING_BINDIR},${bindir},g" \ | 217 | -e "s,${STAGING_BINDIR},${bindir},g" \ |
218 | -e "s,${STAGING_INCDIR},${includedir},g" \ | 218 | -e "s,${STAGING_INCDIR},${includedir},g" \ |
219 | -e "s,${STAGING_BINDIR_NATIVE}/perl-native/,${bindir}/,g" \ | ||
219 | -e "s,${STAGING_BINDIR_NATIVE}/,,g" \ | 220 | -e "s,${STAGING_BINDIR_NATIVE}/,,g" \ |
220 | ${PKGD}${bindir}/h2xs \ | 221 | ${PKGD}${bindir}/h2xs \ |
221 | ${PKGD}${bindir}/h2ph \ | 222 | ${PKGD}${bindir}/h2ph \ |
223 | ${PKGD}${bindir}/pod2html \ | ||
224 | ${PKGD}${bindir}/pod2latex \ | ||
225 | ${PKGD}${bindir}/pod2man \ | ||
226 | ${PKGD}${bindir}/pod2text \ | ||
227 | ${PKGD}${bindir}/pod2usage \ | ||
228 | ${PKGD}${bindir}/podchecker \ | ||
229 | ${PKGD}${bindir}/podselect \ | ||
222 | ${PKGD}${libdir}/perl/${PV}/pod/*.pod \ | 230 | ${PKGD}${libdir}/perl/${PV}/pod/*.pod \ |
223 | ${PKGD}${libdir}/perl/${PV}/cacheout.pl \ | 231 | ${PKGD}${libdir}/perl/${PV}/cacheout.pl \ |
224 | ${PKGD}${libdir}/perl/${PV}/FileCache.pm \ | 232 | ${PKGD}${libdir}/perl/${PV}/FileCache.pm \ |