perl: Sync with OE.dev

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@924 311d38ba-8fff-0310-9ca6-ca027cbcb966

5 files changed, 1084 insertions, 22 deletions

diff --git a/meta/packages/perl/perl-5.8.7/config.sh-sh3-linux b/meta/packages/perl/perl-5.8.7/config.sh-sh3-linux
index d3bee1e4ed..fbdff37045 100644
--- a/meta/packages/perl/perl-5.8.7/config.sh-sh3-linux
+++ b/meta/packages/perl/perl-5.8.7/config.sh-sh3-linux
@@ -971,7 +971,7 @@ useperlio='define'
 useposix='true'
 usereentrant='undef'
 usesfio='false'
-useshrplib='false'
+useshrplib='true'
 usesitecustomize='undef'
 usesocks='undef'
 usethreads='undef'
diff --git a/meta/packages/perl/perl-5.8.7/config.sh-sh4-linux b/meta/packages/perl/perl-5.8.7/config.sh-sh4-linux
index bbbb12360b..e861b60ef7 100644
--- a/meta/packages/perl/perl-5.8.7/config.sh-sh4-linux
+++ b/meta/packages/perl/perl-5.8.7/config.sh-sh4-linux
@@ -325,9 +325,9 @@ d_pipe='define'
 d_poll='define'
 d_portable='define'
 d_procselfexe='define'
-d_pthread_atfork='undef'
+d_pthread_atfork='define'
 d_pthread_attr_setscope='define'
-d_pthread_yield='undef'
+d_pthread_yield='define'
 d_pwage='undef'
 d_pwchange='undef'
 d_pwclass='undef'
@@ -716,12 +716,12 @@ lib_ext='.a'
 libc='/lib/libc-2.2.5.so'
 libperl='libperl.so'
 libpth='/usr/local/lib /lib /usr/lib'
-libs='-lresolv -lnsl -ldl -lm -lcrypt -lutil -lc'
+libs='-lresolv -lnsl -ldl -lm -lpthread -lcrypt -lutil -lc'
 libsdirs=' /usr/lib'
-libsfiles=' libresolv.so libnsl.so libdl.so libm.so libcrypt.so libutil.so libc.so'
-libsfound=' /usr/lib/libresolv.so /usr/lib/libnsl.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
+libsfiles=' libresolv.so libnsl.so libdl.so libm.so libpthread.so libcrypt.so libutil.so libc.so'
+libsfound=' /usr/lib/libresolv.so /usr/lib/libnsl.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libpthread.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
 libspath=' /usr/local/lib /lib /usr/lib'
-libswanted='sfio socket resolv inet nsl nm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD'
+libswanted='sfio socket resolv inet nsl nm gdbm dbm db malloc dl dld ld sun m pthread crypt sec util c cposix posix ucb BSD'
 libswanted_uselargefiles=''
 line=''
 lint=''
@@ -801,7 +801,7 @@ perl5='hostperl'
 perl=''
 perl_patchlevel=''
 perladmin='root@localhost'
-perllibs='-lresolv -lnsl -ldl -lm -lcrypt -lutil -lc'
+perllibs='-lresolv -lnsl -ldl -lm -lpthread -lcrypt -lutil -lc'
 perlpath='hostperl'
 pg='pg'
 phostname=''
@@ -958,7 +958,7 @@ use64bitint='undef'
 usecrosscompile='undef'
 usedl='define'
 usefaststdio='define'
-useithreads='undef'
+useithreads='define'
 uselargefiles='define'
 uselongdouble='undef'
 usemallocwrap='define'
@@ -971,10 +971,10 @@ useperlio='define'
 useposix='true'
 usereentrant='undef'
 usesfio='false'
-useshrplib='false'
+useshrplib='true'
 usesitecustomize='undef'
 usesocks='undef'
-usethreads='undef'
+usethreads='define'
 usevendorprefix='undef'
 usevfork='false'
 usrinc='/usr/include'
diff --git a/meta/packages/perl/perl-5.8.7/config.sh-x86_64-linux b/meta/packages/perl/perl-5.8.7/config.sh-x86_64-linux
new file mode 100644
index 0000000000..89c830e79a
--- /dev/null
+++ b/meta/packages/perl/perl-5.8.7/config.sh-x86_64-linux
@@ -0,0 +1,1043 @@
+#!/bin/sh
+#
+# This file was produced by running the Configure script. It holds all the
+# definitions figured out by Configure. Should you modify one of these values,
+# do not forget to propagate your changes by running "Configure -der". You may
+# instead choose to run each of the .SH files by yourself, or "Configure -S".
+#
+
+# Package name      : perl5
+# Source directory  : .
+# Configuration time: Wed Nov 15 14:03:44 CET 2006
+# Configured by     : hrw
+# Target system     : linux home 2.6.19-rc5 #21 preempt thu nov 9 09:47:50 cet 2006 x86_64 unknown unknown gnulinux 
+
+Author=''
+Date='$Date'
+Header=''
+Id='$Id'
+Locker=''
+Log='$Log'
+Mcc='Mcc'
+RCSfile='$RCSfile'
+Revision='$Revision'
+Source=''
+State=''
+_a='.a'
+_exe=''
+_o='.o'
+afs='false'
+afsroot='/afs'
+alignbytes='8'
+ansi2knr=''
+aphostname='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin/hostname'
+api_revision='5'
+api_subversion='0'
+api_version='8'
+api_versionstring='5.8.0'
+ar='ar'
+archlib='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib/perl5/5.8.7/x86_64-linux-thread-multi'
+archlibexp='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib/perl5/5.8.7/x86_64-linux-thread-multi'
+archname64=''
+archname='x86_64-linux-thread-multi'
+archobjs=''
+asctime_r_proto='REENTRANT_PROTO_B_SB'
+awk='awk'
+baserev='5.0'
+bash=''
+bin='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin'
+binexp='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin'
+bison='bison'
+byacc='byacc'
+byteorder='12345678'
+c=''
+castflags='0'
+cat='cat'
+cc='ccache gcc '
+cccdlflags='-fpic'
+ccdlflags='-Wl,-E'
+ccflags='-D_REENTRANT -D_GNU_SOURCE -DTHREADS_HAVE_PIDS -fno-strict-aliasing -pipe -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
+ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
+ccname='gcc'
+ccsymbols=''
+ccversion=''
+cf_by='hrw'
+cf_email='hrw@home.lan'
+cf_time='Wed Nov 15 14:03:44 CET 2006'
+charsize='1'
+chgrp=''
+chmod='chmod'
+chown=''
+clocktype='clock_t'
+comm='comm'
+compress=''
+contains='grep'
+cp='cp'
+cpio=''
+cpp='cpp'
+cpp_stuff='42'
+cppccsymbols=''
+cppflags='-D_REENTRANT -D_GNU_SOURCE -DTHREADS_HAVE_PIDS -fno-strict-aliasing -pipe -I/usr/local/include'
+cpplast='-'
+cppminus='-'
+cpprun='ccache gcc  -E'
+cppstdin='ccache gcc  -E'
+cppsymbols='__ELF__=1 _FILE_OFFSET_BITS=64 __GLIBC__=2 __GLIBC_MINOR__=3 __GNUC__=4 __GNUC_MINOR__=1 __GNU_LIBRARY__=6 _GNU_SOURCE=1 _LARGEFILE64_SOURCE=1 _LARGEFILE_SOURCE=1 _LP64=1 __LP64__=1 _POSIX_C_SOURCE=199506 _POSIX_SOURCE=1 _REENTRANT=1 __STDC__=1 __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_GNU=1 __USE_LARGEFILE=1 __USE_LARGEFILE64=1 __USE_MISC=1 __USE_POSIX=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_REENTRANT=1 __USE_SVID=1 __USE_UNIX98=1 __USE_XOPEN=1 __USE_XOPEN_EXTENDED=1 _XOPEN_SOURCE=600 _XOPEN_SOURCE_EXTENDED=1 __amd64=1 __amd64__=1 linux=1 __linux=1 __linux__=1 unix=1 __unix=1 __unix__=1'
+crypt_r_proto='REENTRANT_PROTO_B_CCS'
+cryptlib=''
+csh='csh'
+ctermid_r_proto='0'
+ctime_r_proto='REENTRANT_PROTO_B_SB'
+d_Gconvert='gcvt((x),(n),(b))'
+d_PRIEUldbl='define'
+d_PRIFUldbl='define'
+d_PRIGUldbl='define'
+d_PRIXU64='define'
+d_PRId64='define'
+d_PRIeldbl='define'
+d_PRIfldbl='define'
+d_PRIgldbl='define'
+d_PRIi64='define'
+d_PRIo64='define'
+d_PRIu64='define'
+d_PRIx64='define'
+d_SCNfldbl='define'
+d__fwalk='undef'
+d_access='define'
+d_accessx='undef'
+d_aintl='undef'
+d_alarm='define'
+d_archlib='define'
+d_asctime_r='define'
+d_atolf='undef'
+d_atoll='define'
+d_attribut='define'
+d_bcmp='define'
+d_bcopy='define'
+d_bsd='undef'
+d_bsdgetpgrp='undef'
+d_bsdsetpgrp='undef'
+d_bzero='define'
+d_casti32='undef'
+d_castneg='define'
+d_charvspr='define'
+d_chown='define'
+d_chroot='define'
+d_chsize='undef'
+d_class='undef'
+d_closedir='define'
+d_cmsghdr_s='define'
+d_const='define'
+d_copysignl='define'
+d_crypt='define'
+d_crypt_r='define'
+d_csh='undef'
+d_ctermid_r='undef'
+d_ctime_r='define'
+d_cuserid='define'
+d_dbl_dig='define'
+d_dbminitproto='undef'
+d_difftime='define'
+d_dirfd='define'
+d_dirnamlen='undef'
+d_dlerror='define'
+d_dlopen='define'
+d_dlsymun='undef'
+d_dosuid='undef'
+d_drand48_r='define'
+d_drand48proto='define'
+d_dup2='define'
+d_eaccess='undef'
+d_endgrent='define'
+d_endgrent_r='undef'
+d_endhent='define'
+d_endhostent_r='undef'
+d_endnent='define'
+d_endnetent_r='undef'
+d_endpent='define'
+d_endprotoent_r='undef'
+d_endpwent='define'
+d_endpwent_r='undef'
+d_endsent='define'
+d_endservent_r='undef'
+d_eofnblk='define'
+d_eunice='undef'
+d_faststdio='undef'
+d_fchdir='define'
+d_fchmod='define'
+d_fchown='define'
+d_fcntl='define'
+d_fcntl_can_lock='define'
+d_fd_macros='define'
+d_fd_set='define'
+d_fds_bits='define'
+d_fgetpos='define'
+d_finite='define'
+d_finitel='define'
+d_flexfnam='define'
+d_flock='define'
+d_flockproto='define'
+d_fork='define'
+d_fp_class='undef'
+d_fpathconf='define'
+d_fpclass='undef'
+d_fpclassify='undef'
+d_fpclassl='undef'
+d_fpos64_t='undef'
+d_frexpl='define'
+d_fs_data_s='undef'
+d_fseeko='define'
+d_fsetpos='define'
+d_fstatfs='define'
+d_fstatvfs='define'
+d_fsync='define'
+d_ftello='define'
+d_ftime='undef'
+d_getcwd='define'
+d_getespwnam='undef'
+d_getfsstat='undef'
+d_getgrent='define'
+d_getgrent_r='define'
+d_getgrgid_r='define'
+d_getgrnam_r='define'
+d_getgrps='define'
+d_gethbyaddr='define'
+d_gethbyname='define'
+d_gethent='define'
+d_gethname='define'
+d_gethostbyaddr_r='define'
+d_gethostbyname_r='define'
+d_gethostent_r='define'
+d_gethostprotos='define'
+d_getitimer='define'
+d_getlogin='define'
+d_getlogin_r='define'
+d_getmnt='undef'
+d_getmntent='define'
+d_getnbyaddr='define'
+d_getnbyname='define'
+d_getnent='define'
+d_getnetbyaddr_r='define'
+d_getnetbyname_r='define'
+d_getnetent_r='define'
+d_getnetprotos='define'
+d_getpagsz='define'
+d_getpbyname='define'
+d_getpbynumber='define'
+d_getpent='define'
+d_getpgid='define'
+d_getpgrp2='undef'
+d_getpgrp='define'
+d_getppid='define'
+d_getprior='define'
+d_getprotobyname_r='define'
+d_getprotobynumber_r='define'
+d_getprotoent_r='define'
+d_getprotoprotos='define'
+d_getprpwnam='undef'
+d_getpwent='define'
+d_getpwent_r='define'
+d_getpwnam_r='define'
+d_getpwuid_r='define'
+d_getsbyname='define'
+d_getsbyport='define'
+d_getsent='define'
+d_getservbyname_r='define'
+d_getservbyport_r='define'
+d_getservent_r='define'
+d_getservprotos='define'
+d_getspnam='define'
+d_getspnam_r='define'
+d_gettimeod='define'
+d_gmtime_r='define'
+d_gnulibc='define'
+d_grpasswd='define'
+d_hasmntopt='define'
+d_htonl='define'
+d_ilogbl='define'
+d_index='undef'
+d_inetaton='define'
+d_int64_t='define'
+d_isascii='define'
+d_isfinite='undef'
+d_isinf='define'
+d_isnan='define'
+d_isnanl='define'
+d_killpg='define'
+d_lchown='define'
+d_ldbl_dig='define'
+d_libm_lib_version='define'
+d_link='define'
+d_localtime_r='define'
+d_locconv='define'
+d_lockf='define'
+d_longdbl='define'
+d_longlong='define'
+d_lseekproto='define'
+d_lstat='define'
+d_madvise='define'
+d_mblen='define'
+d_mbstowcs='define'
+d_mbtowc='define'
+d_memchr='define'
+d_memcmp='define'
+d_memcpy='define'
+d_memmove='define'
+d_memset='define'
+d_mkdir='define'
+d_mkdtemp='define'
+d_mkfifo='define'
+d_mkstemp='define'
+d_mkstemps='undef'
+d_mktime='define'
+d_mmap='define'
+d_modfl='define'
+d_modfl_pow32_bug='undef'
+d_modflproto='define'
+d_mprotect='define'
+d_msg='define'
+d_msg_ctrunc='define'
+d_msg_dontroute='define'
+d_msg_oob='define'
+d_msg_peek='define'
+d_msg_proxy='define'
+d_msgctl='define'
+d_msgget='define'
+d_msghdr_s='define'
+d_msgrcv='define'
+d_msgsnd='define'
+d_msync='define'
+d_munmap='define'
+d_mymalloc='undef'
+d_nice='define'
+d_nl_langinfo='define'
+d_nv_preserves_uv='undef'
+d_off64_t='define'
+d_old_pthread_create_joinable='undef'
+d_oldpthreads='undef'
+d_oldsock='undef'
+d_open3='define'
+d_pathconf='define'
+d_pause='define'
+d_perl_otherlibdirs='undef'
+d_phostname='undef'
+d_pipe='define'
+d_poll='define'
+d_portable='define'
+d_procselfexe='define'
+d_pthread_atfork='define'
+d_pthread_attr_setscope='define'
+d_pthread_yield='define'
+d_pwage='undef'
+d_pwchange='undef'
+d_pwclass='undef'
+d_pwcomment='undef'
+d_pwexpire='undef'
+d_pwgecos='define'
+d_pwpasswd='define'
+d_pwquota='undef'
+d_qgcvt='define'
+d_quad='define'
+d_random_r='define'
+d_readdir64_r='define'
+d_readdir='define'
+d_readdir_r='define'
+d_readlink='define'
+d_readv='define'
+d_recvmsg='define'
+d_rename='define'
+d_rewinddir='define'
+d_rmdir='define'
+d_safebcpy='undef'
+d_safemcpy='undef'
+d_sanemcmp='define'
+d_sbrkproto='define'
+d_scalbnl='define'
+d_sched_yield='define'
+d_scm_rights='define'
+d_seekdir='define'
+d_select='define'
+d_sem='define'
+d_semctl='define'
+d_semctl_semid_ds='define'
+d_semctl_semun='define'
+d_semget='define'
+d_semop='define'
+d_sendmsg='define'
+d_setegid='define'
+d_seteuid='define'
+d_setgrent='define'
+d_setgrent_r='undef'
+d_setgrps='define'
+d_sethent='define'
+d_sethostent_r='undef'
+d_setitimer='define'
+d_setlinebuf='define'
+d_setlocale='define'
+d_setlocale_r='undef'
+d_setnent='define'
+d_setnetent_r='undef'
+d_setpent='define'
+d_setpgid='define'
+d_setpgrp2='undef'
+d_setpgrp='define'
+d_setprior='define'
+d_setproctitle='undef'
+d_setprotoent_r='undef'
+d_setpwent='define'
+d_setpwent_r='undef'
+d_setregid='define'
+d_setresgid='define'
+d_setresuid='define'
+d_setreuid='define'
+d_setrgid='undef'
+d_setruid='undef'
+d_setsent='define'
+d_setservent_r='undef'
+d_setsid='define'
+d_setvbuf='define'
+d_sfio='undef'
+d_shm='define'
+d_shmat='define'
+d_shmatprototype='define'
+d_shmctl='define'
+d_shmdt='define'
+d_shmget='define'
+d_sigaction='define'
+d_sigprocmask='define'
+d_sigsetjmp='define'
+d_sockatmark='define'
+d_sockatmarkproto='define'
+d_socket='define'
+d_socklen_t='define'
+d_sockpair='define'
+d_socks5_init='undef'
+d_sqrtl='define'
+d_srand48_r='define'
+d_srandom_r='define'
+d_sresgproto='define'
+d_sresuproto='define'
+d_statblks='define'
+d_statfs_f_flags='undef'
+d_statfs_s='define'
+d_statvfs='define'
+d_stdio_cnt_lval='undef'
+d_stdio_ptr_lval='undef'
+d_stdio_ptr_lval_nochange_cnt='undef'
+d_stdio_ptr_lval_sets_cnt='undef'
+d_stdio_stream_array='undef'
+d_stdiobase='undef'
+d_stdstdio='undef'
+d_strchr='define'
+d_strcoll='define'
+d_strctcpy='define'
+d_strerrm='strerror(e)'
+d_strerror='define'
+d_strerror_r='define'
+d_strftime='define'
+d_strlcat='undef'
+d_strlcpy='undef'
+d_strtod='define'
+d_strtol='define'
+d_strtold='define'
+d_strtoll='define'
+d_strtoq='define'
+d_strtoul='define'
+d_strtoull='define'
+d_strtouq='define'
+d_strxfrm='define'
+d_suidsafe='undef'
+d_symlink='define'
+d_syscall='define'
+d_syscallproto='define'
+d_sysconf='define'
+d_sysernlst=''
+d_syserrlst='define'
+d_system='define'
+d_tcgetpgrp='define'
+d_tcsetpgrp='define'
+d_telldir='define'
+d_telldirproto='define'
+d_time='define'
+d_times='define'
+d_tm_tm_gmtoff='define'
+d_tm_tm_zone='define'
+d_tmpnam_r='define'
+d_truncate='define'
+d_ttyname_r='define'
+d_tzname='define'
+d_u32align='define'
+d_ualarm='define'
+d_umask='define'
+d_uname='define'
+d_union_semun='undef'
+d_unordered='undef'
+d_usleep='define'
+d_usleepproto='define'
+d_ustat='define'
+d_vendorarch='define'
+d_vendorbin='define'
+d_vendorlib='define'
+d_vendorscript='define'
+d_vfork='undef'
+d_void_closedir='undef'
+d_voidsig='define'
+d_voidtty=''
+d_volatile='define'
+d_vprintf='define'
+d_wait4='define'
+d_waitpid='define'
+d_wcstombs='define'
+d_wctomb='define'
+d_writev='define'
+d_xenix='undef'
+date='date'
+db_hashtype='u_int32_t'
+db_prefixtype='size_t'
+db_version_major=''
+db_version_minor=''
+db_version_patch=''
+defvoidused='15'
+direntrytype='struct dirent'
+dlext='so'
+dlsrc='dl_dlopen.xs'
+doublesize='8'
+drand01='drand48()'
+drand48_r_proto='REENTRANT_PROTO_I_ST'
+dynamic_ext='B ByteLoader Cwd Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Encode Fcntl File/Glob Filter/Util/Call I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Time/HiRes Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared'
+eagain='EAGAIN'
+ebcdic='undef'
+echo='echo'
+egrep='egrep'
+emacs=''
+endgrent_r_proto='0'
+endhostent_r_proto='0'
+endnetent_r_proto='0'
+endprotoent_r_proto='0'
+endpwent_r_proto='0'
+endservent_r_proto='0'
+eunicefix=':'
+exe_ext=''
+expr='expr'
+extensions='B ByteLoader Cwd Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Encode Fcntl File/Glob Filter/Util/Call I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Time/HiRes Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared Errno'
+extras=''
+fflushNULL='define'
+fflushall='undef'
+find=''
+firstmakefile='makefile'
+flex=''
+fpossize='16'
+fpostype='fpos_t'
+freetype='void'
+from=':'
+full_ar='/usr/bin/ar'
+full_csh='/bin/csh'
+full_sed='/bin/sed'
+gccansipedantic=''
+gccosandvers=''
+gccversion='4.1.2 20061028 (prerelease) (Debian 4.1.1-19)'
+getgrent_r_proto='REENTRANT_PROTO_I_SBWR'
+getgrgid_r_proto='REENTRANT_PROTO_I_TSBWR'
+getgrnam_r_proto='REENTRANT_PROTO_I_CSBWR'
+gethostbyaddr_r_proto='REENTRANT_PROTO_I_TsISBWRE'
+gethostbyname_r_proto='REENTRANT_PROTO_I_CSBWRE'
+gethostent_r_proto='REENTRANT_PROTO_I_SBWRE'
+getlogin_r_proto='REENTRANT_PROTO_I_BW'
+getnetbyaddr_r_proto='REENTRANT_PROTO_I_uISBWRE'
+getnetbyname_r_proto='REENTRANT_PROTO_I_CSBWRE'
+getnetent_r_proto='REENTRANT_PROTO_I_SBWRE'
+getprotobyname_r_proto='REENTRANT_PROTO_I_CSBWR'
+getprotobynumber_r_proto='REENTRANT_PROTO_I_ISBWR'
+getprotoent_r_proto='REENTRANT_PROTO_I_SBWR'
+getpwent_r_proto='REENTRANT_PROTO_I_SBWR'
+getpwnam_r_proto='REENTRANT_PROTO_I_CSBWR'
+getpwuid_r_proto='REENTRANT_PROTO_I_TSBWR'
+getservbyname_r_proto='REENTRANT_PROTO_I_CCSBWR'
+getservbyport_r_proto='REENTRANT_PROTO_I_ICSBWR'
+getservent_r_proto='REENTRANT_PROTO_I_SBWR'
+getspnam_r_proto='REENTRANT_PROTO_I_CSBWR'
+gidformat='"u"'
+gidsign='1'
+gidsize='4'
+gidtype='gid_t'
+glibpth='/usr/shlib  /lib /usr/lib /lib64 /usr/lib64 /usr/lib/386 /lib/386 /usr/ccs/lib /usr/ucblib /usr/local/lib '
+gmake='gmake'
+gmtime_r_proto='REENTRANT_PROTO_S_TS'
+gnulibc_version='2.3.6'
+grep='grep'
+groupcat='cat /etc/group'
+groupstype='gid_t'
+gzip='gzip'
+h_fcntl='false'
+h_sysfile='true'
+hint='recommended'
+hostcat='cat /etc/hosts'
+html1dir=' '
+html1direxp=''
+html3dir=' '
+html3direxp=''
+i16size='2'
+i16type='short'
+i32size='4'
+i32type='int'
+i64size='8'
+i64type='long'
+i8size='1'
+i8type='char'
+i_arpainet='define'
+i_bsdioctl=''
+i_crypt='define'
+i_db='undef'
+i_dbm='undef'
+i_dirent='define'
+i_dld='undef'
+i_dlfcn='define'
+i_fcntl='undef'
+i_float='define'
+i_fp='undef'
+i_fp_class='undef'
+i_gdbm='undef'
+i_grp='define'
+i_ieeefp='undef'
+i_inttypes='define'
+i_langinfo='define'
+i_libutil='undef'
+i_limits='define'
+i_locale='define'
+i_machcthr='undef'
+i_malloc='define'
+i_math='define'
+i_memory='undef'
+i_mntent='define'
+i_ndbm='undef'
+i_netdb='define'
+i_neterrno='undef'
+i_netinettcp='define'
+i_niin='define'
+i_poll='define'
+i_prot='undef'
+i_pthread='define'
+i_pwd='define'
+i_rpcsvcdbm='undef'
+i_sfio='undef'
+i_sgtty='undef'
+i_shadow='define'
+i_socks='undef'
+i_stdarg='define'
+i_stddef='define'
+i_stdlib='define'
+i_string='define'
+i_sunmath='undef'
+i_sysaccess='undef'
+i_sysdir='define'
+i_sysfile='define'
+i_sysfilio='undef'
+i_sysin='undef'
+i_sysioctl='define'
+i_syslog='define'
+i_sysmman='define'
+i_sysmode='undef'
+i_sysmount='define'
+i_sysndir='undef'
+i_sysparam='define'
+i_sysresrc='define'
+i_syssecrt='undef'
+i_sysselct='define'
+i_syssockio='undef'
+i_sysstat='define'
+i_sysstatfs='define'
+i_sysstatvfs='define'
+i_systime='define'
+i_systimek='undef'
+i_systimes='define'
+i_systypes='define'
+i_sysuio='define'
+i_sysun='define'
+i_sysutsname='define'
+i_sysvfs='define'
+i_syswait='define'
+i_termio='undef'
+i_termios='define'
+i_time='define'
+i_unistd='define'
+i_ustat='define'
+i_utime='define'
+i_values='define'
+i_varargs='undef'
+i_varhdr='stdarg.h'
+i_vfork='undef'
+ignore_versioned_solibs='y'
+inc_version_list=' '
+inc_version_list_init='0'
+incpath=''
+inews=''
+installarchlib='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib/perl5/5.8.7/x86_64-linux-thread-multi'
+installbin='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin'
+installhtml1dir=''
+installhtml3dir=''
+installman1dir='/home/hrw/devel/build/native/tmp/staging/man/man1'
+installman3dir='/home/hrw/devel/build/native/tmp/staging/man/man3'
+installprefix='/home/hrw/devel/build/native/tmp/staging'
+installprefixexp='/home/hrw/devel/build/native/tmp/staging'
+installprivlib='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib/perl5/5.8.7'
+installscript='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin'
+installsitearch='/home/hrw/devel/build/native/tmp/staging/local/lib/perl5/site_perl/5.8.7/x86_64-linux-thread-multi'
+installsitebin='/home/hrw/devel/build/native/tmp/staging/local/bin'
+installsitehtml1dir=''
+installsitehtml3dir=''
+installsitelib='/home/hrw/devel/build/native/tmp/staging/local/lib/perl5/site_perl/5.8.7'
+installsiteman1dir='/home/hrw/devel/build/native/tmp/staging/local/man/man1'
+installsiteman3dir='/home/hrw/devel/build/native/tmp/staging/local/man/man3'
+installsitescript='/home/hrw/devel/build/native/tmp/staging/local/bin'
+installstyle='lib/perl5'
+installusrbinperl='undef'
+installvendorarch='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib/perl5/vendor_perl/5.8.7/x86_64-linux-thread-multi'
+installvendorbin='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin'
+installvendorhtml1dir=''
+installvendorhtml3dir=''
+installvendorlib='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib/perl5/vendor_perl/5.8.7'
+installvendorman1dir='/home/hrw/devel/build/native/tmp/staging/man/man1'
+installvendorman3dir='/home/hrw/devel/build/native/tmp/staging/man/man3'
+installvendorscript='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin'
+intsize='4'
+issymlink='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin/test -h'
+ivdformat='"ld"'
+ivsize='8'
+ivtype='long'
+known_extensions='B ByteLoader Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Encode Fcntl File/Glob Filter/Util/Call GDBM_File I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Thread Time/HiRes Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared'
+ksh=''
+ld='ccache gcc '
+lddlflags='-shared -L/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib -L/usr/local/lib'
+ldflags='-L/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib -Wl,-rpath-link,/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib -Wl,-rpath,/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib -Wl,-O1} -L/usr/local/lib'
+ldflags_uselargefiles=''
+ldlibpthname='LD_LIBRARY_PATH'
+less='less'
+lib_ext='.a'
+libc='/lib/libc-2.3.6.so'
+libperl='libperl.a'
+libpth='/usr/local/lib /lib /usr/lib /lib64 /usr/lib64'
+libs='-lnsl -ldl -lm -lcrypt -lutil -lpthread -lc'
+libsdirs=' /usr/lib'
+libsfiles=' libnsl.so libdl.so libm.so libcrypt.so libutil.so libpthread.so libc.so'
+libsfound=' /usr/lib/libnsl.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libpthread.so /usr/lib/libc.so'
+libspath=' /usr/local/lib /lib /usr/lib /lib64 /usr/lib64'
+libswanted='sfio socket inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util pthread c cposix posix ucb BSD'
+libswanted_uselargefiles=''
+line=''
+lint=''
+lkflags=''
+ln='ln'
+lns='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin/ln -s'
+localtime_r_proto='REENTRANT_PROTO_S_TS'
+locincpth='/usr/local/include /opt/local/include /usr/gnu/include /opt/gnu/include /usr/GNU/include /opt/GNU/include'
+loclibpth='/usr/local/lib /opt/local/lib /usr/gnu/lib /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib'
+longdblsize='16'
+longlongsize='8'
+longsize='8'
+lp=''
+lpr=''
+ls='ls'
+lseeksize='8'
+lseektype='off_t'
+mail=''
+mailx=''
+make='make'
+make_set_make='#'
+mallocobj=''
+mallocsrc=''
+malloctype='void *'
+man1dir='/home/hrw/devel/build/native/tmp/staging/man/man1'
+man1direxp='/home/hrw/devel/build/native/tmp/staging/man/man1'
+man1ext='1'
+man3dir='/home/hrw/devel/build/native/tmp/staging/man/man3'
+man3direxp='/home/hrw/devel/build/native/tmp/staging/man/man3'
+man3ext='3perl'
+mips_type=''
+mistrustnm=''
+mkdir='mkdir'
+mmaptype='void *'
+modetype='mode_t'
+more='more'
+multiarch='undef'
+mv=''
+myarchname='x86_64-linux'
+mydomain='.lan'
+myhostname='home'
+myuname='linux home 2.6.19-rc5 #21 preempt thu nov 9 09:47:50 cet 2006 x86_64 unknown unknown gnulinux '
+n='-n'
+need_va_copy='define'
+netdb_hlen_type='size_t'
+netdb_host_type='char *'
+netdb_name_type='const char *'
+netdb_net_type='in_addr_t'
+nm='nm'
+nm_opt=''
+nm_so_opt='--dynamic'
+nonxs_ext='Errno'
+nroff='nroff'
+nvEUformat='"E"'
+nvFUformat='"F"'
+nvGUformat='"G"'
+nv_preserves_uv_bits='53'
+nveformat='"e"'
+nvfformat='"f"'
+nvgformat='"g"'
+nvsize='8'
+nvtype='double'
+o_nonblock='O_NONBLOCK'
+obj_ext='.o'
+old_pthread_create_joinable=''
+optimize='-O2'
+orderlib='false'
+osname='linux'
+osvers='2.6.19-rc5'
+otherlibdirs=' '
+package='perl5'
+pager='/usr/bin/less'
+passcat='cat /etc/passwd'
+patchlevel='8'
+path_sep=':'
+perl5='/usr/bin/perl'
+perl=''
+perl_patchlevel=''
+perladmin='hrw@home.lan'
+perllibs='-lnsl -ldl -lm -lcrypt -lutil -lpthread -lc'
+perlpath='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin/perl'
+pg='pg'
+phostname='hostname'
+pidtype='pid_t'
+plibpth=''
+pmake=''
+pr=''
+prefix='/home/hrw/devel/build/native/tmp/staging'
+prefixexp='/home/hrw/devel/build/native/tmp/staging'
+privlib='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib/perl5/5.8.7'
+privlibexp='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib/perl5/5.8.7'
+procselfexe='"/proc/self/exe"'
+prototype='define'
+ptrsize='8'
+quadkind='2'
+quadtype='long'
+randbits='48'
+randfunc='drand48'
+random_r_proto='REENTRANT_PROTO_I_St'
+randseedtype='long'
+ranlib=':'
+rd_nodata='-1'
+readdir64_r_proto='REENTRANT_PROTO_I_TSR'
+readdir_r_proto='REENTRANT_PROTO_I_TSR'
+revision='5'
+rm='rm'
+rmail=''
+run=''
+runnm='false'
+sPRIEUldbl='"LE"'
+sPRIFUldbl='"LF"'
+sPRIGUldbl='"LG"'
+sPRIXU64='"lX"'
+sPRId64='"ld"'
+sPRIeldbl='"Le"'
+sPRIfldbl='"Lf"'
+sPRIgldbl='"Lg"'
+sPRIi64='"li"'
+sPRIo64='"lo"'
+sPRIu64='"lu"'
+sPRIx64='"lx"'
+sSCNfldbl='"Lf"'
+sched_yield='sched_yield()'
+scriptdir='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin'
+scriptdirexp='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin'
+sed='sed'
+seedfunc='srand48'
+selectminbits='64'
+selecttype='fd_set *'
+sendmail=''
+setgrent_r_proto='0'
+sethostent_r_proto='0'
+setlocale_r_proto='0'
+setnetent_r_proto='0'
+setprotoent_r_proto='0'
+setpwent_r_proto='0'
+setservent_r_proto='0'
+sh='/bin/sh'
+shar=''
+sharpbang='#!'
+shmattype='void *'
+shortsize='2'
+shrpenv=''
+shsharp='true'
+sig_count='65'
+sig_name='ZERO HUP INT QUIT ILL TRAP ABRT BUS FPE KILL USR1 SEGV USR2 PIPE ALRM TERM STKFLT CHLD CONT STOP TSTP TTIN TTOU URG XCPU XFSZ VTALRM PROF WINCH IO PWR SYS NUM32 NUM33 RTMIN NUM35 NUM36 NUM37 NUM38 NUM39 NUM40 NUM41 NUM42 NUM43 NUM44 NUM45 NUM46 NUM47 NUM48 NUM49 NUM50 NUM51 NUM52 NUM53 NUM54 NUM55 NUM56 NUM57 NUM58 NUM59 NUM60 NUM61 NUM62 NUM63 RTMAX IOT CLD POLL UNUSED '
+sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "BUS", "FPE", "KILL", "USR1", "SEGV", "USR2", "PIPE", "ALRM", "TERM", "STKFLT", "CHLD", "CONT", "STOP", "TSTP", "TTIN", "TTOU", "URG", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "IO", "PWR", "SYS", "NUM32", "NUM33", "RTMIN", "NUM35", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "NUM63", "RTMAX", "IOT", "CLD", "POLL", "UNUSED", 0'
+sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 6 17 29 31 '
+sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 6, 17, 29, 31, 0'
+sig_size='69'
+signal_t='void'
+sitearch='/home/hrw/devel/build/native/tmp/staging/local/lib/perl5/site_perl/5.8.7/x86_64-linux-thread-multi'
+sitearchexp='/home/hrw/devel/build/native/tmp/staging/local/lib/perl5/site_perl/5.8.7/x86_64-linux-thread-multi'
+sitebin='/home/hrw/devel/build/native/tmp/staging/local/bin'
+sitebinexp='/home/hrw/devel/build/native/tmp/staging/local/bin'
+sitehtml1dir=''
+sitehtml1direxp=''
+sitehtml3dir=''
+sitehtml3direxp=''
+sitelib='/home/hrw/devel/build/native/tmp/staging/local/lib/perl5/site_perl/5.8.7'
+sitelib_stem='/home/hrw/devel/build/native/tmp/staging/local/lib/perl5/site_perl'
+sitelibexp='/home/hrw/devel/build/native/tmp/staging/local/lib/perl5/site_perl/5.8.7'
+siteman1dir='/home/hrw/devel/build/native/tmp/staging/local/man/man1'
+siteman1direxp='/home/hrw/devel/build/native/tmp/staging/local/man/man1'
+siteman3dir='/home/hrw/devel/build/native/tmp/staging/local/man/man3'
+siteman3direxp='/home/hrw/devel/build/native/tmp/staging/local/man/man3'
+siteprefix='/home/hrw/devel/build/native/tmp/staging/local'
+siteprefixexp='/home/hrw/devel/build/native/tmp/staging/local'
+sitescript='/home/hrw/devel/build/native/tmp/staging/local/bin'
+sitescriptexp='/home/hrw/devel/build/native/tmp/staging/local/bin'
+sizesize='8'
+sizetype='size_t'
+sleep=''
+smail=''
+so='so'
+sockethdr=''
+socketlib=''
+socksizetype='socklen_t'
+sort='sort'
+spackage='Perl5'
+spitshell='cat'
+srand48_r_proto='REENTRANT_PROTO_I_LS'
+srandom_r_proto='REENTRANT_PROTO_I_TS'
+src='.'
+ssizetype='ssize_t'
+startperl='#!/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin/perl'
+startsh='#!/bin/sh'
+static_ext=' '
+stdchar='char'
+stdio_base='((fp)->_IO_read_base)'
+stdio_bufsiz='((fp)->_IO_read_end - (fp)->_IO_read_base)'
+stdio_cnt='((fp)->_IO_read_end - (fp)->_IO_read_ptr)'
+stdio_filbuf=''
+stdio_ptr='((fp)->_IO_read_ptr)'
+stdio_stream_array=''
+strerror_r_proto='REENTRANT_PROTO_B_IBW'
+strings='/usr/include/string.h'
+submit=''
+subversion='7'
+sysman='/usr/share/man/man1'
+tail=''
+tar=''
+targetarch=''
+tbl=''
+tee=''
+test='test'
+timeincl='/usr/include/sys/time.h /usr/include/time.h '
+timetype='time_t'
+tmpnam_r_proto='REENTRANT_PROTO_B_B'
+to=':'
+touch='touch'
+tr='tr'
+trnl='\n'
+troff=''
+ttyname_r_proto='REENTRANT_PROTO_I_IBW'
+u16size='2'
+u16type='unsigned short'
+u32size='4'
+u32type='unsigned int'
+u64size='8'
+u64type='unsigned long'
+u8size='1'
+u8type='unsigned char'
+uidformat='"u"'
+uidsign='1'
+uidsize='4'
+uidtype='uid_t'
+uname='uname'
+uniq='uniq'
+uquadtype='unsigned long'
+use5005threads='undef'
+use64bitall='define'
+use64bitint='define'
+usecrosscompile='undef'
+usedl='define'
+usefaststdio='define'
+useithreads='define'
+uselargefiles='define'
+uselongdouble='undef'
+usemallocwrap='define'
+usemorebits='undef'
+usemultiplicity='define'
+usemymalloc='n'
+usenm='false'
+useopcode='true'
+useperlio='define'
+useposix='true'
+usereentrant='undef'
+usesfio='false'
+useshrplib='false'
+usesitecustomize='undef'
+usesocks='undef'
+usethreads='define'
+usevendorprefix='define'
+usevfork='false'
+usrinc='/usr/include'
+uuname=''
+uvXUformat='"lX"'
+uvoformat='"lo"'
+uvsize='8'
+uvtype='unsigned long'
+uvuformat='"lu"'
+uvxformat='"lx"'
+vendorarch='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib/perl5/vendor_perl/5.8.7/x86_64-linux-thread-multi'
+vendorarchexp='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib/perl5/vendor_perl/5.8.7/x86_64-linux-thread-multi'
+vendorbin='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin'
+vendorbinexp='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin'
+vendorhtml1dir=' '
+vendorhtml1direxp=''
+vendorhtml3dir=' '
+vendorhtml3direxp=''
+vendorlib='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib/perl5/vendor_perl/5.8.7'
+vendorlib_stem='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib/perl5/vendor_perl'
+vendorlibexp='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib/perl5/vendor_perl/5.8.7'
+vendorman1dir='/home/hrw/devel/build/native/tmp/staging/man/man1'
+vendorman1direxp='/home/hrw/devel/build/native/tmp/staging/man/man1'
+vendorman3dir='/home/hrw/devel/build/native/tmp/staging/man/man3'
+vendorman3direxp='/home/hrw/devel/build/native/tmp/staging/man/man3'
+vendorprefix='/home/hrw/devel/build/native/tmp/staging'
+vendorprefixexp='/home/hrw/devel/build/native/tmp/staging'
+vendorscript='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin'
+vendorscriptexp='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin'
+version='5.8.7'
+version_patchlevel_string='version 8 subversion 7'
+versiononly='undef'
+vi=''
+voidflags='15'
+xlibpth='/usr/lib/386 /lib/386'
+yacc='yacc'
+yaccflags=''
+zcat=''
+zip='zip'
+# Configure command line arguments.
+config_arg0='./Configure'
+config_args='-Dcc=ccache gcc  -Dcflags=-isystem/home/hrw/devel/build/native/tmp/staging/x86_64-linux/include -O2 -Dldflags=-L/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib -Wl,-rpath-link,/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib -Wl,-rpath,/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib -Wl,-O1} -Dusethreads -Duselargefiles -Dprefix=/home/hrw/devel/build/native/tmp/staging -Dvendorprefix=/home/hrw/devel/build/native/tmp/staging -Dsiteprefix=/home/hrw/devel/build/native/tmp/staging/local -Dman1ext=1 -Dman3ext=3perl -Uafs -Ud_csh -Uusesfio -Uusenm -des'
+config_argc=15
+config_arg1='-Dcc=ccache gcc '
+config_arg2='-Dcflags=-isystem/home/hrw/devel/build/native/tmp/staging/x86_64-linux/include -O2'
+config_arg3='-Dldflags=-L/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib -Wl,-rpath-link,/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib -Wl,-rpath,/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib -Wl,-O1}'
+config_arg4='-Dusethreads'
+config_arg5='-Duselargefiles'
+config_arg6='-Dprefix=/home/hrw/devel/build/native/tmp/staging'
+config_arg7='-Dvendorprefix=/home/hrw/devel/build/native/tmp/staging'
+config_arg8='-Dsiteprefix=/home/hrw/devel/build/native/tmp/staging/local'
+config_arg9='-Dman1ext=1'
+config_arg10='-Dman3ext=3perl'
+config_arg11='-Uafs'
+config_arg12='-Ud_csh'
+config_arg13='-Uusesfio'
+config_arg14='-Uusenm'
+config_arg15='-des'
+PERL_REVISION=5
+PERL_VERSION=8
+PERL_SUBVERSION=7
+PERL_API_REVISION=5
+PERL_API_VERSION=8
+PERL_API_SUBVERSION=0
+PERL_PATCHLEVEL=
+PERL_CONFIG_SH=true
diff --git a/meta/packages/perl/perl.inc b/meta/packages/perl/perl.inc
index 9824e0739b..7e42f45314 100644
--- a/meta/packages/perl/perl.inc
+++ b/meta/packages/perl/perl.inc
@@ -14,7 +14,7 @@ SRC_URI = "ftp://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \
         file://config.sh-mipsel-linux \
         file://config.sh-i686-linux"
 
-HOSTPERL=${STAGING_BINDIR}/perl${PV}
+HOSTPERL="${STAGING_BINDIR}/perl${PV}"
 
 do_configure() {
         ln -sf ${HOSTPERL} ${STAGING_BINDIR}/hostperl 
@@ -41,14 +41,17 @@ do_configure() {
 do_compile() {
         sed -i -e 's|/usr/include|${STAGING_INCDIR}|g' ext/Errno/Errno_pm.PL
         cd Cross
-        oe_runmake perl
+        # You must use gcc to link on sh
+        OPTIONS=""
+        if test ${TARGET_ARCH} = "sh3" -o ${TARGET_ARCH} = "sh4"; then
+                OPTIONS="LD=${TARGET_ARCH}-${TARGET_OS}-gcc"
+        fi
+        oe_runmake perl $OPTIONS
 }
 
 do_install() {
         oe_runmake install
-        # Make sure the shared library is configured before trying to move it
-        grep -q "useshrplib='false'" ${S}/config.sh ||
-                mv ${D}/${libdir}/perl5/${PV}/${TARGET_ARCH}-${TARGET_OS}/CORE/libperl.so ${D}/${libdir}/libperl.so.${PV}
+        mv ${D}/${libdir}/perl5/${PV}/${TARGET_ARCH}-${TARGET_OS}/CORE/libperl.so ${D}/${libdir}/libperl.so.${PV}
         ( cd ${D}/usr/bin/; rm perl; ln -s perl${PV} perl )
 }
 
@@ -77,3 +80,4 @@ FILES_${PN}-dbg += " \
         ${libdir}/perl5/${PV}/${TARGET_ARCH}-${TARGET_OS}/auto/*/.debug \
         ${libdir}/perl5/${PV}/${TARGET_ARCH}-${TARGET_OS}/auto/*/*/.debug \
         ${libdir}/perl5/${PV}/${TARGET_ARCH}-${TARGET_OS}/auto/*/*/*/.debug"
+
diff --git a/meta/packages/perl/perl_5.8.7.bb b/meta/packages/perl/perl_5.8.7.bb
index 5e1c4660d8..a7095433a3 100644
--- a/meta/packages/perl/perl_5.8.7.bb
+++ b/meta/packages/perl/perl_5.8.7.bb
@@ -1,4 +1,7 @@
 
+# We need gnugrep (for -I)
+DEPENDS_append += " grep-native"
+
 require perl.inc
 
 SRC_URI += "file://config.sh-armeb-linux \
@@ -6,12 +9,21 @@ SRC_URI += "file://config.sh-armeb-linux \
             file://config.sh-i386-linux \
             file://config.sh-i486-linux \
             file://config.sh-i586-linux \
+            file://config.sh-i686-linux \
+            file://config.sh-x86_64-linux \
             file://config.sh-sh3-linux \
             file://config.sh-sh4-linux"
 
+# Patches for sh3/sh4, use gcc to link and override generaet.sh to
+# use PIC mode for compiling shared library objects.
+SRC_URI_append_sh4 += "file://override-generate-sh.patch;patch=1"
+SRC_URI_append_sh4 += "file://makefile-usegcc-to-link.patch;patch=1"
+SRC_URI_append_sh3 += "file://override-generate-sh.patch;patch=1"
+SRC_URI_append_sh3 += "file://makefile-usegcc-to-link.patch;patch=1"
+
 PARALLEL_MAKE = ""
 
-PR = "r17"
+PR = "r21"
 
 do_configure() {
         ln -sf ${HOSTPERL} ${STAGING_BINDIR}/hostperl
@@ -24,6 +36,7 @@ do_configure() {
         cp ${WORKDIR}/config.sh-i486-linux .
         cp ${WORKDIR}/config.sh-i586-linux .
         cp ${WORKDIR}/config.sh-i686-linux .
+        cp ${WORKDIR}/config.sh-x86_64-linux .
         cp ${WORKDIR}/config.sh-armeb-linux .
         cp ${WORKDIR}/config.sh-sh3-linux .
         cp ${WORKDIR}/config.sh-sh4-linux .
@@ -45,7 +58,7 @@ do_configure() {
         sed -i -e "s%/usr/include/%${STAGING_INCDIR}/%g" config.sh-${TARGET_ARCH}-${TARGET_OS}
 
         #These are strewn all over the source tree
-        for foo in `grep -m1 \/usr\/include\/.*\\.h ${WORKDIR}/* -r | cut -f 1 -d ":"` ; do
+        for foo in `grep -I -m1 \/usr\/include\/.*\\.h ${WORKDIR}/* -r | cut -f 1 -d ":"` ; do
                 echo Fixing: $foo
                 sed -e "s%/usr/include/%${STAGING_INCDIR}/%g" -i $foo
         done
@@ -56,15 +69,13 @@ do_configure() {
 }
 
 do_install_append() {
-        # Make sure the shared library is configured before trying to symlink it
-        grep -q "useshrplib='false'" ${S}/config.sh ||
-                ln -s libperl.so.${PV} ${D}/${libdir}/libperl.so.5
+        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
+ALLOW_EMPTY_perl-modules = "1"
 PACKAGES_append = " perl-modules"
 RRECOMMENDS_perl-modules = "${PACKAGES}"
 RPROVIDES_perl-lib = "perl-lib"
@@ -75,6 +86,10 @@ require perl-rdepends_${PV}.inc
 # To create/update the perl-rdepends_${PV}.inc use this piece of ugly script (modified for your arch/paths etc):
 # daka@DaKa2:/home/slug/slugos/tmp/work/perl-5.8.7-r14/install$ egrep -r "use|require" * | grep ";$" | egrep ".pm:use |.pm:require " | grep -v v5.6.0 | grep -v 5.00 | grep -v \$module | sed -e "s, \+, ,g" | cut -f1,2 -d" " | sed -e "s,;, ,g" | sed -e "s,(), ,g" | sed -e "s,::,-,g" | sort | uniq | tr [:upper:] [:lower:] | sed -e "s,/[^ ]\+ , += \"perl-module-,g" | sed -e "s, \?$, \",g" | sed -e "s,_,-,g" | sed -e "s,^,RDEPENDS_,g" | sed -e "s,armeb-linux,\$\{TARGET_ARCH\}-\$\{TARGET_OS\},g" | egrep -v "perl-module-5|perl-module-tk|perl-module-mac-internetconfig|perl-module-ndbm-file|perl-module-html-treebuilder|perl-module-lwp-simple|perl-module-vms-filespec|perl-module-fcgi|perl-module-vms-stdio|perl-module-mac-buildtools" > /home/slug/openembedded/packages/perl/perl-rdepends_5.8.7.inc
 
+# Some additional dependencies that the above doesn't manage to figure out
+DEPENDS_perl-module-math-bigint += "perl-module-math-bigint-calc "
+DEPENDS_perl-module-math-bigint-calc += "perl-module-integer "
+
 # Some packages changed names in 5.8.7-r14, RPROVIDE them
 RPROVIDES_perl-module-b-asmdata = "perl-module-${TARGET_SYS}-b-asmdata"
 RPROVIDES_perl-module-b-assembler = "perl-module-${TARGET_SYS}-b-assembler"