[oe-commits] Tom Rini : perl-native: Switch to using create_wrapper to make perl relocatable.

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 4c82344174104ca65b733dcbe1f68f5193fd2254
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=4c82344174104ca65b733dcbe1f68f5193fd2254

Author: Tom Rini <tom_rini at mentor.com>
Date:   Thu Feb  3 11:54:22 2011 -0700

perl-native: Switch to using create_wrapper to make perl relocatable.

This is taken from poky.  In addition to problems in upstream
perl 5.12.x, Martin Jansa discovered that the regex perl uses during
install is broken for things like /OE/whatever (due to not escapipng the
periods in the regex perl uses).

Signed-off-by: Tom Rini <tom_rini at mentor.com>

---

 recipes/perl/perl-native_5.10.1.bb |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/recipes/perl/perl-native_5.10.1.bb b/recipes/perl/perl-native_5.10.1.bb
index 35cd3c0..5aa0c7b 100644
--- a/recipes/perl/perl-native_5.10.1.bb
+++ b/recipes/perl/perl-native_5.10.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Perl is a popular scripting language."
 HOMEPAGE = "http://www.perl.org/"
 SECTION = "libs"
 LICENSE = "Artistic|GPLv1+"
-PR = "r9"
+PR = "r10"
 NATIVE_INSTALL_WORKS = "1"
 INHIBIT_DEFAULT_DEPS = "1"
 PATCHTOOL = "patch"
@@ -41,15 +41,14 @@ do_configure () {
         -Dvendorprefix=${prefix} \
         -Dsiteprefix=${prefix} \
          \
-        -Dprivlib=.../../lib/perl/${PV} \
-        -Darchlib=.../../lib/perl/${PV} \
-        -Dvendorlib=.../../lib/perl/${PV} \
-        -Dvendorarch=.../../lib/perl/${PV} \
-        -Dsitelib=.../../lib/perl/${PV} \
-        -Dsitearch=.../../lib/perl/${PV} \
-        -Duserelocatableinc="y" \
+        -Dprivlib=${STAGING_LIBDIR}/perl/${PV} \
+        -Darchlib=${STAGING_LIBDIR}/perl/${PV} \
+        -Dvendorlib=${STAGING_LIBDIR}/perl/${PV} \
+        -Dvendorarch=${STAGING_LIBDIR}/perl/${PV} \
+        -Dsitelib=${STAGING_LIBDIR}/perl/${PV} \
+        -Dsitearch=${STAGING_LIBDIR}/perl/${PV} \
         \
-        -Uuseshrplib \
+        -Duseshrplib \
         -Dusethreads \
         -Duseithreads \
         -Duselargefiles \
@@ -104,6 +103,8 @@ do_install() {
 	for PERLSCRIPT in `grep -rIEl '#!.*/perl' ${D}${bindir}`; do
 		sed -i -e '1s|^#!.*|#!/usr/bin/env perl|' $PERLSCRIPT
 	done
+
+	create_wrapper ${D}${bindir}/perl PERL5LIB='$PERL5LIB:${STAGING_LIBDIR}/perl/${PV}:${STAGING_LIBDIR}/perl/'
 }
 
 do_install_append_nylon() {