Patchwork [4/6] perl: Fix a few perl binaries to use target interpreter paths

login
register
mail settings
Submitter Mark Hatle
Date Sept. 22, 2011, 1:47 a.m.
Message ID <6ee052f54df893132cc9c8dc1c6dedd7515eb3af.1316655855.git.mark.hatle@windriver.com>
Download mbox | patch
Permalink /patch/11939/
State New, archived
Headers show

Comments

Mark Hatle - Sept. 22, 2011, 1:47 a.m.
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>
---
 meta/recipes-devtools/perl/perl_5.12.3.bb |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

Patch

diff --git a/meta/recipes-devtools/perl/perl_5.12.3.bb b/meta/recipes-devtools/perl/perl_5.12.3.bb
index d286564..e4769a4 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 \