summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2011-09-21 20:47:03 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-22 05:06:40 +0100
commit7b8db36e088e3e9cd585e8d8dde1c1c2860c3c2e (patch)
tree0807d7884f1bc2feafd5a76b262f89659c1d50eb
parent79cd09017693e0fd1634ea9748c797fcec4dac14 (diff)
downloadopenembedded-core-7b8db36e088e3e9cd585e8d8dde1c1c2860c3c2e.tar.gz
openembedded-core-7b8db36e088e3e9cd585e8d8dde1c1c2860c3c2e.tar.bz2
openembedded-core-7b8db36e088e3e9cd585e8d8dde1c1c2860c3c2e.zip
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. Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/perl/perl_5.12.3.bb10
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 \
# We need gnugrep (for -I)
DEPENDS = "virtual/db grep-native"
DEPENDS += "gdbm zlib"
-PR = "r4"
+PR = "r5"
# 5.10.1 has Module::Build built-in
PROVIDES += "libmodule-build-perl"
@@ -216,9 +216,17 @@ perl_package_preprocess () {
-e "s,${STAGING_LIBDIR},${libdir},g" \
-e "s,${STAGING_BINDIR},${bindir},g" \
-e "s,${STAGING_INCDIR},${includedir},g" \
+ -e "s,${STAGING_BINDIR_NATIVE}/perl-native/,${bindir}/,g" \
-e "s,${STAGING_BINDIR_NATIVE}/,,g" \
${PKGD}${bindir}/h2xs \
${PKGD}${bindir}/h2ph \
+ ${PKGD}${bindir}/pod2html \
+ ${PKGD}${bindir}/pod2latex \
+ ${PKGD}${bindir}/pod2man \
+ ${PKGD}${bindir}/pod2text \
+ ${PKGD}${bindir}/pod2usage \
+ ${PKGD}${bindir}/podchecker \
+ ${PKGD}${bindir}/podselect \
${PKGD}${libdir}/perl/${PV}/pod/*.pod \
${PKGD}${libdir}/perl/${PV}/cacheout.pl \
${PKGD}${libdir}/perl/${PV}/FileCache.pm \