Revert "perl-native: Update for userelocatableinc and non-shared libperl"

This reverts commit fe59ca31ac267ecd2dc3a8f2fb9ad5297b88f62c.

This broke builds for various people as reported in the bugzilla and on the
mailing list so we're reverting the change until Tom has a chance to make it
work properly for 5.12 (5.10 seems to work differently).

The DEPENDS change is left in since that part was valid.

1 files changed, 9 insertions, 15 deletions

diff --git a/meta/recipes-devtools/perl/perl-native_5.12.2.bb b/meta/recipes-devtools/perl/perl-native_5.12.2.bb
index a634da5c23..fe8dbaaff0 100644
--- a/meta/recipes-devtools/perl/perl-native_5.12.2.bb
+++ b/meta/recipes-devtools/perl/perl-native_5.12.2.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
 LICENSE = "Artistic|GPL"
 LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
                     file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8"
-PR = "r3"
+PR = "r4"
 
 LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
                     file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8"
@@ -28,21 +28,19 @@ do_configure () {
                 -Dcflags="${CFLAGS}" \
                 -Dldflags="${LDFLAGS}" \
                 -Dcf_by="Open Embedded" \
-                \
                 -Dprefix=${prefix} \
                 -Dvendorprefix=${prefix} \
                 -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 \
@@ -90,12 +88,8 @@ do_install () {
                 install $i ${D}${libdir}/perl/${PV}/CORE
         done
 
-        # Make sure we use /usr/bin/env perl
-        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/5.12.2:${STAGING_LIBDIR}/perl/'
 }
-
 do_install_append_nylon() {
         # get rid of definitions not supported by the gcc version we use for nylon...
         for i in ${D}${libdir}/perl/${PV}/Config_heavy.pl ${D}${libdir}/perl/config.sh; do