4 files changed, 12 insertions, 13 deletions
diff --git a/packages/perl/perl-5.8.7/config.sh-arm-linux.patch b/packages/perl/perl-5.8.7/config.sh-arm-linux.patch
index ae162fbdc6..0181e37c95 100644
--- a/packages/perl/perl-5.8.7/config.sh-arm-linux.patch
+++ b/packages/perl/perl-5.8.7/config.sh-arm-linux.patch
@@ -17,21 +17,13 @@
  perl=''
  perl_patchlevel=''
  perladmin='red@criticalintegration.com'
- perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc'
+-perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc'
++perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc -lgcc_s'
 -perlpath='/usr/bin/perl'
 +perlpath='hostperl'
  pg='pg'
  phostname='hostname'
  pidtype='pid_t'
-@@ -906,7 +907,7 @@
- srandom_r_proto='0'
- src='.'
- ssizetype='ssize_t'
--startperl='#!/usr/bin/perl'
-+startperl='#!hostperl'
- startsh='#!/bin/sh'
- static_ext=' '
- stdchar='char'
 @@ -971,6 +972,7 @@
  usereentrant='undef'
  usesfio='false'
diff --git a/packages/perl/perl-5.8.7/config.sh-armeb-linux b/packages/perl/perl-5.8.7/config.sh-armeb-linux
index 3c5adaf70b..155b5237aa 100644
--- a/packages/perl/perl-5.8.7/config.sh-armeb-linux
+++ b/packages/perl/perl-5.8.7/config.sh-armeb-linux
@@ -907,7 +907,7 @@ srand48_r_proto='0'
 srandom_r_proto='0'
 src='.'
 ssizetype='ssize_t'
-startperl='#!hostperl'
+startperl='#!/usr/bin/perl'
 startsh='#!/bin/sh'
 static_ext=' '
 stdchar='char'
diff --git a/packages/perl/perl-5.8.7/config.sh-i686-linux b/packages/perl/perl-5.8.7/config.sh-i686-linux
index b09b7140e7..313ff2fbb1 100644
--- a/packages/perl/perl-5.8.7/config.sh-i686-linux
+++ b/packages/perl/perl-5.8.7/config.sh-i686-linux
@@ -905,7 +905,7 @@ srand48_r_proto='0'
 srandom_r_proto='0'
 src='.'
 ssizetype='ssize_t'
-startperl='#!hostperl'
+startperl='#!/usr/bin/perl'
 startsh='#!/bin/sh'
 static_ext=' '
 stdchar='char'
diff --git a/packages/perl/perl_5.8.7.bb b/packages/perl/perl_5.8.7.bb
index dc457b43ff..babeea3e9a 100644
--- a/packages/perl/perl_5.8.7.bb
+++ b/packages/perl/perl_5.8.7.bb
@@ -4,7 +4,7 @@ include perl.inc
 
 SRC_URI += "file://config.sh-armeb-linux"
 
-PR = "r4"
+PR = "r9"
 
 do_configure() {
 	ln -sf ${HOSTPERL} ${STAGING_BINDIR}/hostperl
@@ -30,5 +30,12 @@ do_configure() {
 
 do_install_append() {
 	ln -s libperl.so.${PV} ${D}/${libdir}/libperl.so.5
+	sed -i -e "s,${D},,g" ${D}/${libdir}/perl5/${PV}/${TARGET_ARCH}-${TARGET_OS}/Config_heavy.pl
 }
 
+# Create a perl-modules package recommending all the other perl
+# packages (actually the non modules packages and not created too)
+ALLOW_EMPTY_perl-modules = 1
+PACKAGES_append = " perl-modules"
+RRECOMMENDS_perl-modules = "${PACKAGES}"
+RPROVIDES_perl-lib = "perl-lib"