summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/perl
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-28 14:15:30 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-28 15:19:42 +0100
commit3d3893d26191307e99a261064885aeaf1e4c1ec7 (patch)
tree3b07687b2d42405aefda884a41a316f3bcb3f012 /meta/recipes-devtools/perl
parentc4788b733087d320a5b98edd485bff3195b185b4 (diff)
downloadpoky-3d3893d26191307e99a261064885aeaf1e4c1ec7.tar.gz
perl: Fix substitution madness
We're going around in circles trying to fix the sed expressions and making one case work and others not work. This patch fixes the base configuration file so we have non-overlapping substitutions. I've tried to significantly clean up various problems that were occurring once and for all. This will hopefully resolve all the issues people have been seeing with incorrect perl paths. (From OE-Core rev: 31ff70794ecc431431476f81c8934fff25383613) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/perl')
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.2/config.sh144
-rw-r--r--meta/recipes-devtools/perl/perl_5.14.2.bb12
2 files changed, 78 insertions, 78 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.14.2/config.sh b/meta/recipes-devtools/perl/perl-5.14.2/config.sh
index ed946d3829..0d4ca1cd91 100644
--- a/meta/recipes-devtools/perl/perl-5.14.2/config.sh
+++ b/meta/recipes-devtools/perl/perl-5.14.2/config.sh
@@ -14,7 +14,7 @@
14 14
15: Configure command line arguments. 15: Configure command line arguments.
16config_arg0='Configure' 16config_arg0='Configure'
17config_args='-des -Doptimize=-O2 -Dmyhostname=localhost -Dperladmin=root@localhost -Dcc=gcc -Dcf_by=Open Embedded -Dinstallprefix=@DESTDIR@ -Dprefix=/usr -Dvendorprefix=/usr -Dsiteprefix=/usr -Dotherlibdirs=/usr/lib/perl5/5.14.2 -Duseshrplib -Dusethreads -Duseithreads -Duselargefiles -Ud_dosuid -Dd_semctl_semun -Ui_db -Ui_ndbm -Ui_gdbm -Di_shadow -Di_syslog -Dman3ext=3pm -Duseperlio -Dinstallusrbinperl -Ubincompat5005 -Uversiononly -Dpager=/usr/bin/less -isr' 17config_args='-des -Doptimize=-O2 -Dmyhostname=localhost -Dperladmin=root@localhost -Dcc=gcc -Dcf_by=Open Embedded -Dinstallprefix=@EXECPREFIX@ -Dprefix=@EXECPREFIX@ -Dvendorprefix=@EXECPREFIX@ -Dsiteprefix=@EXECPREFIX@ -Dotherlibdirs=@LIBDIR@/perl/5.14.2 -Duseshrplib -Dusethreads -Duseithreads -Duselargefiles -Ud_dosuid -Dd_semctl_semun -Ui_db -Ui_ndbm -Ui_gdbm -Di_shadow -Di_syslog -Dman3ext=3pm -Duseperlio -Dinstallusrbinperl -Ubincompat5005 -Uversiononly -Dpager=/usr/bin/less -isr'
18config_argc=28 18config_argc=28
19config_arg1='-des' 19config_arg1='-des'
20config_arg2='-Doptimize=-O2' 20config_arg2='-Doptimize=-O2'
@@ -22,11 +22,11 @@ config_arg3='-Dmyhostname=localhost'
22config_arg4='-Dperladmin=root@localhost' 22config_arg4='-Dperladmin=root@localhost'
23config_arg5='-Dcc=gcc' 23config_arg5='-Dcc=gcc'
24config_arg6='-Dcf_by=Open Embedded' 24config_arg6='-Dcf_by=Open Embedded'
25config_arg7='-Dinstallprefix=@DESTDIR@' 25config_arg7='-Dinstallprefix=@EXECPREFIX@'
26config_arg8='-Dprefix=/usr' 26config_arg8='-Dprefix=@EXECPREFIX@'
27config_arg9='-Dvendorprefix=/usr' 27config_arg9='-Dvendorprefix=@EXECPREFIX@'
28config_arg10='-Dsiteprefix=/usr' 28config_arg10='-Dsiteprefix=@EXECPREFIX@'
29config_arg11='-Dotherlibdirs=/usr/lib/perl5/5.14.2' 29config_arg11='-Dotherlibdirs=@LIBDIR@/perl/5.14.2'
30config_arg12='-Duseshrplib' 30config_arg12='-Duseshrplib'
31config_arg13='-Dusethreads' 31config_arg13='-Dusethreads'
32config_arg14='-Duseithreads' 32config_arg14='-Duseithreads'
@@ -67,8 +67,8 @@ api_subversion='0'
67api_version='14' 67api_version='14'
68api_versionstring='5.14.0' 68api_versionstring='5.14.0'
69ar='ar' 69ar='ar'
70archlib='/usr/lib/perl5/5.14.2/@ARCH@-thread-multi' 70archlib='@LIBDIR@/perl/5.14.2/@ARCH@-thread-multi'
71archlibexp='@STAGINGDIR@/usr/lib/perl5/5.14.2/@ARCH@-thread-multi' 71archlibexp='@STAGINGDIR@@LIBDIR@/perl/5.14.2/@ARCH@-thread-multi'
72archname64='' 72archname64=''
73archname='@ARCH@-thread-multi' 73archname='@ARCH@-thread-multi'
74archobjs='' 74archobjs=''
@@ -76,9 +76,9 @@ asctime_r_proto='REENTRANT_PROTO_B_SB'
76awk='awk' 76awk='awk'
77baserev='5.0' 77baserev='5.0'
78bash='' 78bash=''
79bin='/usr/bin' 79bin='@USRBIN@'
80bin_ELF='define' 80bin_ELF='define'
81binexp='/usr/bin' 81binexp='@USRBIN@'
82bison='bison' 82bison='bison'
83byacc='byacc' 83byacc='byacc'
84c='' 84c=''
@@ -86,7 +86,7 @@ castflags='0'
86cat='cat' 86cat='cat'
87cc='gcc' 87cc='gcc'
88cccdlflags='-fPIC' 88cccdlflags='-fPIC'
89ccdlflags='-Wl,-E -Wl,-rpath,/usr/lib/perl5/5.14.2/@ARCH@-thread-multi/CORE' 89ccdlflags='-Wl,-E -Wl,-rpath,@LIBDIR@/perl/5.14.2/@ARCH@-thread-multi/CORE'
90ccflags='-D_REENTRANT -D_GNU_SOURCE -fno-strict-aliasing -pipe -fstack-protector -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' 90ccflags='-D_REENTRANT -D_GNU_SOURCE -fno-strict-aliasing -pipe -fstack-protector -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
91ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' 91ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
92ccname='gcc' 92ccname='gcc'
@@ -602,9 +602,9 @@ fpossize='16'
602fpostype='fpos_t' 602fpostype='fpos_t'
603freetype='void' 603freetype='void'
604from=':' 604from=':'
605full_ar='/usr/bin/ar' 605full_ar='ar'
606full_csh='csh' 606full_csh='csh'
607full_sed='/bin/sed' 607full_sed='sed'
608gccansipedantic='' 608gccansipedantic=''
609gccosandvers='' 609gccosandvers=''
610gccversion='4.5.1' 610gccversion='4.5.1'
@@ -631,7 +631,7 @@ getspnam_r_proto='REENTRANT_PROTO_I_CSBWR'
631gidsign='1' 631gidsign='1'
632gidsize='4' 632gidsize='4'
633gidtype='gid_t' 633gidtype='gid_t'
634glibpth='/usr/shlib /lib /usr/lib /usr/lib/386 /lib/386 /usr/ccs/lib /usr/ucblib /usr/local/lib ' 634glibpth='@EXECPREFIX@/shlib @BASELIBDIR@ @LIBDIR@ @LIBDIR@/386 @BASELIBDIR@/386 @EXECPREFIX@/ccs/lib @EXECPREFIX@/ucblib @EXECPREFIX@/local/lib '
635gmake='gmake' 635gmake='gmake'
636gmtime_r_proto='REENTRANT_PROTO_S_TS' 636gmtime_r_proto='REENTRANT_PROTO_S_TS'
637gnulibc_version='2.12.1' 637gnulibc_version='2.12.1'
@@ -745,35 +745,35 @@ inc_version_list=' '
745inc_version_list_init='0' 745inc_version_list_init='0'
746incpath='' 746incpath=''
747inews='' 747inews=''
748initialinstalllocation='/usr/bin' 748initialinstalllocation='@USRBIN@'
749installarchlib='@DESTDIR@/lib/perl5/5.14.2/@ARCH@-thread-multi' 749installarchlib='@LIBDIR@/perl/5.14.2/@ARCH@-thread-multi'
750installbin='@DESTDIR@/bin' 750installbin='@USRBIN@'
751installhtml1dir='' 751installhtml1dir=''
752installhtml3dir='' 752installhtml3dir=''
753installman1dir='' 753installman1dir=''
754installman3dir='' 754installman3dir=''
755installprefix='@DESTDIR@' 755installprefix='@EXECPREFIX@'
756installprefixexp='@DESTDIR@' 756installprefixexp='@EXECPREFIX@'
757installprivlib='@DESTDIR@/lib/perl5/5.14.2' 757installprivlib='@LIBDIR@/perl/5.14.2'
758installscript='@DESTDIR@/bin' 758installscript='@USRBIN@'
759installsitearch='@DESTDIR@/lib/perl5/site_perl/5.14.2/@ARCH@-thread-multi' 759installsitearch='@LIBDIR@/perl/site_perl/5.14.2/@ARCH@-thread-multi'
760installsitebin='@DESTDIR@/bin' 760installsitebin='@USRBIN@'
761installsitehtml1dir='' 761installsitehtml1dir=''
762installsitehtml3dir='' 762installsitehtml3dir=''
763installsitelib='@DESTDIR@/lib/perl5/site_perl/5.14.2' 763installsitelib='@LIBDIR@/perl/site_perl/5.14.2'
764installsiteman1dir='' 764installsiteman1dir=''
765installsiteman3dir='' 765installsiteman3dir=''
766installsitescript='@DESTDIR@/bin' 766installsitescript='@USRBIN@'
767installstyle='lib/perl5' 767installstyle='lib/perl'
768installusrbinperl='define' 768installusrbinperl='define'
769installvendorarch='@DESTDIR@/lib/perl5/vendor_perl/5.14.2/@ARCH@-thread-multi' 769installvendorarch='@LIBDIR@/perl/vendor_perl/5.14.2/@ARCH@-thread-multi'
770installvendorbin='@DESTDIR@/bin' 770installvendorbin='@USRBIN@'
771installvendorhtml1dir='' 771installvendorhtml1dir=''
772installvendorhtml3dir='' 772installvendorhtml3dir=''
773installvendorlib='@DESTDIR@/lib/perl5/vendor_perl/5.14.2' 773installvendorlib='@LIBDIR@/perl/vendor_perl/5.14.2'
774installvendorman1dir='' 774installvendorman1dir=''
775installvendorman3dir='' 775installvendorman3dir=''
776installvendorscript='@DESTDIR@/bin' 776installvendorscript='@USRBIN@'
777intsize='4' 777intsize='4'
778issymlink='test -h' 778issymlink='test -h'
779ivdformat='"ld"' 779ivdformat='"ld"'
@@ -787,14 +787,14 @@ ldflags_uselargefiles=''
787ldlibpthname='LD_LIBRARY_PATH' 787ldlibpthname='LD_LIBRARY_PATH'
788less='less' 788less='less'
789lib_ext='.a' 789lib_ext='.a'
790libc='/lib/libc-2.12.1.so' 790libc='@BASELIBDIR@/libc-2.12.1.so'
791libperl='libperl.so' 791libperl='libperl.so'
792libpth='/lib /usr/lib' 792libpth='@BASELIBDIR@ @LIBDIR@'
793libs='-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lpthread -lc' 793libs='-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lpthread -lc'
794libsdirs=' /usr/lib' 794libsdirs=' @LIBDIR@'
795libsfiles=' libnsl.so libgdbm.so libdb.so libdl.so libm.so libcrypt.so libutil.so libpthread.so libc.so' 795libsfiles=' libnsl.so libgdbm.so libdb.so libdl.so libm.so libcrypt.so libutil.so libpthread.so libc.so'
796libsfound=' /usr/lib/libnsl.so /usr/lib/libgdbm.so /usr/lib/libdb.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' 796libsfound=' @LIBDIR@/libnsl.so @LIBDIR@/libgdbm.so @LIBDIR@/libdb.so @LIBDIR@/libdl.so @LIBDIR@/libm.so @LIBDIR@/libcrypt.so @LIBDIR@/libutil.so @LIBDIR@/libpthread.so @LIBDIR@/libc.so'
797libspath=' /lib /usr/lib' 797libspath=' @BASELIBDIR@ @LIBDIR@'
798libswanted='sfio socket inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util pthread c cposix posix ucb BSD gdbm_compat' 798libswanted='sfio socket inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util pthread c cposix posix ucb BSD gdbm_compat'
799libswanted_uselargefiles='' 799libswanted_uselargefiles=''
800line='' 800line=''
@@ -803,8 +803,8 @@ lkflags=''
803ln='ln' 803ln='ln'
804lns='/bin/ln -s' 804lns='/bin/ln -s'
805localtime_r_proto='REENTRANT_PROTO_S_TS' 805localtime_r_proto='REENTRANT_PROTO_S_TS'
806locincpth='/usr/local/include /opt/local/include /usr/gnu/include /opt/gnu/include /usr/GNU/include /opt/GNU/include' 806locincpth='@EXECPREFIX@/local/include /opt/local/include @EXECPREFIX@/gnu/include /opt/gnu/include @EXECPREFIX@/GNU/include /opt/GNU/include'
807loclibpth='/usr/local/lib /opt/local/lib /usr/gnu/lib /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib' 807loclibpth='@EXECPREFIX@/local/lib /opt/local/lib @EXECPREFIX@/gnu/lib /opt/gnu/lib @EXECPREFIX@/GNU/lib /opt/GNU/lib'
808longlongsize='8' 808longlongsize='8'
809lp='' 809lp=''
810lpr='' 810lpr=''
@@ -864,28 +864,28 @@ optimize='-O2'
864orderlib='false' 864orderlib='false'
865osname='linux' 865osname='linux'
866osvers='2.6.37-rc5-yocto-standard+' 866osvers='2.6.37-rc5-yocto-standard+'
867otherlibdirs='/usr/lib/perl5/5.14.2' 867otherlibdirs='@LIBDIR@/perl/5.14.2'
868package='perl5' 868package='perl5'
869pager='/usr/bin/less -isr' 869pager='/usr/bin/less -isr'
870passcat='cat /etc/passwd' 870passcat='cat /etc/passwd'
871patchlevel='14' 871patchlevel='14'
872path_sep=':' 872path_sep=':'
873perl5='/usr/bin/perl' 873perl5='@USRBIN@/perl'
874perl='' 874perl=''
875perl_patchlevel='' 875perl_patchlevel=''
876perladmin='root@localhost' 876perladmin='root@localhost'
877perllibs='-lnsl -ldl -lm -lcrypt -lutil -lpthread -lc' 877perllibs='-lnsl -ldl -lm -lcrypt -lutil -lpthread -lc'
878perlpath='/usr/bin/perl' 878perlpath='@USRBIN@/perl'
879pg='pg' 879pg='pg'
880phostname='' 880phostname=''
881pidtype='pid_t' 881pidtype='pid_t'
882plibpth='' 882plibpth=''
883pmake='' 883pmake=''
884pr='' 884pr=''
885prefix='/usr' 885prefix='@EXECPREFIX@'
886prefixexp='/usr' 886prefixexp='@EXECPREFIX@'
887privlib='/usr/lib/perl5/5.14.2' 887privlib='@LIBDIR@/perl/5.14.2'
888privlibexp='/usr/lib/perl5/5.14.2' 888privlibexp='@LIBDIR@/perl/5.14.2'
889procselfexe='"/proc/self/exe"' 889procselfexe='"/proc/self/exe"'
890prototype='define' 890prototype='define'
891randbits='48' 891randbits='48'
@@ -910,8 +910,8 @@ sPRIfldbl='"Lf"'
910sPRIgldbl='"Lg"' 910sPRIgldbl='"Lg"'
911sSCNfldbl='"Lf"' 911sSCNfldbl='"Lf"'
912sched_yield='sched_yield()' 912sched_yield='sched_yield()'
913scriptdir='/usr/bin' 913scriptdir='@USRBIN@'
914scriptdirexp='/usr/bin' 914scriptdirexp='@USRBIN@'
915sed='sed' 915sed='sed'
916seedfunc='srand48' 916seedfunc='srand48'
917selecttype='fd_set *' 917selecttype='fd_set *'
@@ -937,25 +937,25 @@ 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
937sig_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' 937sig_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'
938sig_size='69' 938sig_size='69'
939signal_t='void' 939signal_t='void'
940sitearch='/usr/lib/perl5/site_perl/5.14.2/@ARCH@-thread-multi' 940sitearch='@LIBDIR@/perl/site_perl/5.14.2/@ARCH@-thread-multi'
941sitearchexp='/usr/lib/perl5/site_perl/5.14.2/@ARCH@-thread-multi' 941sitearchexp='@LIBDIR@/perl/site_perl/5.14.2/@ARCH@-thread-multi'
942sitebin='/usr/bin' 942sitebin='@USRBIN@'
943sitebinexp='/usr/bin' 943sitebinexp='@USRBIN@'
944sitehtml1dir='' 944sitehtml1dir=''
945sitehtml1direxp='' 945sitehtml1direxp=''
946sitehtml3dir='' 946sitehtml3dir=''
947sitehtml3direxp='' 947sitehtml3direxp=''
948sitelib='/usr/lib/perl5/site_perl/5.14.2' 948sitelib='@LIBDIR@/perl/site_perl/5.14.2'
949sitelib_stem='/usr/lib/perl5/site_perl' 949sitelib_stem='@LIBDIR@/perl/site_perl'
950sitelibexp='/usr/lib/perl5/site_perl/5.14.2' 950sitelibexp='@LIBDIR@/perl/site_perl/5.14.2'
951siteman1dir='' 951siteman1dir=''
952siteman1direxp='' 952siteman1direxp=''
953siteman3dir='' 953siteman3dir=''
954siteman3direxp='' 954siteman3direxp=''
955siteprefix='/usr' 955siteprefix='@EXECPREFIX@'
956siteprefixexp='/usr' 956siteprefixexp='@EXECPREFIX@'
957sitescript='/usr/bin' 957sitescript='@USRBIN@'
958sitescriptexp='/usr/bin' 958sitescriptexp='@USRBIN@'
959sizetype='size_t' 959sizetype='size_t'
960sleep='' 960sleep=''
961smail='' 961smail=''
@@ -970,7 +970,7 @@ srand48_r_proto='REENTRANT_PROTO_I_LS'
970srandom_r_proto='REENTRANT_PROTO_I_TS' 970srandom_r_proto='REENTRANT_PROTO_I_TS'
971src='.' 971src='.'
972ssizetype='ssize_t' 972ssizetype='ssize_t'
973startperl='#!/usr/bin/perl' 973startperl='#!@USRBIN@/perl'
974startsh='#!/bin/sh' 974startsh='#!/bin/sh'
975static_ext=' ' 975static_ext=' '
976stdchar='char' 976stdchar='char'
@@ -981,17 +981,17 @@ stdio_filbuf=''
981stdio_ptr='((fp)->_IO_read_ptr)' 981stdio_ptr='((fp)->_IO_read_ptr)'
982stdio_stream_array='' 982stdio_stream_array=''
983strerror_r_proto='REENTRANT_PROTO_B_IBW' 983strerror_r_proto='REENTRANT_PROTO_B_IBW'
984strings='/usr/include/string.h' 984strings='@INCLUDEDIR@/string.h'
985submit='' 985submit=''
986subversion='2' 986subversion='2'
987sysman='/usr/share/man/man1' 987sysman='@EXECPREFIX@/share/man/man1'
988tail='' 988tail=''
989tar='' 989tar=''
990targetarch='' 990targetarch=''
991tbl='' 991tbl=''
992tee='' 992tee=''
993test='test' 993test='test'
994timeincl='/usr/include/sys/time.h /usr/include/time.h ' 994timeincl='@INCLUDEDIR@/sys/time.h @INCLUDEDIR@/time.h '
995timetype='time_t' 995timetype='time_t'
996tmpnam_r_proto='REENTRANT_PROTO_B_B' 996tmpnam_r_proto='REENTRANT_PROTO_B_B'
997to=':' 997to=':'
@@ -1037,7 +1037,7 @@ usesocks='undef'
1037usethreads='define' 1037usethreads='define'
1038usevendorprefix='define' 1038usevendorprefix='define'
1039usevfork='false' 1039usevfork='false'
1040usrinc='/usr/include' 1040usrinc='@INCLUDEDIR@'
1041uuname='' 1041uuname=''
1042uvXUformat='"lX"' 1042uvXUformat='"lX"'
1043uvoformat='"lo"' 1043uvoformat='"lo"'
@@ -1045,31 +1045,31 @@ uvtype='unsigned long'
1045uvuformat='"lu"' 1045uvuformat='"lu"'
1046uvxformat='"lx"' 1046uvxformat='"lx"'
1047vaproto='define' 1047vaproto='define'
1048vendorarch='/usr/lib/perl5/vendor_perl/5.14.2/@ARCH@-thread-multi' 1048vendorarch='@LIBDIR@/perl/vendor_perl/5.14.2/@ARCH@-thread-multi'
1049vendorarchexp='/usr/lib/perl5/vendor_perl/5.14.2/@ARCH@-thread-multi' 1049vendorarchexp='@LIBDIR@/perl/vendor_perl/5.14.2/@ARCH@-thread-multi'
1050vendorbin='/usr/bin' 1050vendorbin='@USRBIN@'
1051vendorbinexp='/usr/bin' 1051vendorbinexp='@USRBIN@'
1052vendorhtml1dir=' ' 1052vendorhtml1dir=' '
1053vendorhtml1direxp='' 1053vendorhtml1direxp=''
1054vendorhtml3dir=' ' 1054vendorhtml3dir=' '
1055vendorhtml3direxp='' 1055vendorhtml3direxp=''
1056vendorlib='/usr/lib/perl5/vendor_perl/5.14.2' 1056vendorlib='@LIBDIR@/perl/vendor_perl/5.14.2'
1057vendorlib_stem='/usr/lib/perl5/vendor_perl' 1057vendorlib_stem='@LIBDIR@/perl/vendor_perl'
1058vendorlibexp='/usr/lib/perl5/vendor_perl/5.14.2' 1058vendorlibexp='@LIBDIR@/perl/vendor_perl/5.14.2'
1059vendorman1dir=' ' 1059vendorman1dir=' '
1060vendorman1direxp='' 1060vendorman1direxp=''
1061vendorman3dir=' ' 1061vendorman3dir=' '
1062vendorman3direxp='' 1062vendorman3direxp=''
1063vendorprefix='/usr' 1063vendorprefix='/usr'
1064vendorprefixexp='/usr' 1064vendorprefixexp='/usr'
1065vendorscript='/usr/bin' 1065vendorscript='@USRBIN@'
1066vendorscriptexp='/usr/bin' 1066vendorscriptexp='@USRBIN@'
1067version='5.14.2' 1067version='5.14.2'
1068version_patchlevel_string='version 14 subversion 2' 1068version_patchlevel_string='version 14 subversion 2'
1069versiononly='undef' 1069versiononly='undef'
1070vi='' 1070vi=''
1071voidflags='15' 1071voidflags='15'
1072xlibpth='/usr/lib/386 /lib/386' 1072xlibpth='@LIBDIR@/386 @BASELIBDIR@/386'
1073yacc='yacc' 1073yacc='yacc'
1074yaccflags='' 1074yaccflags=''
1075zcat='' 1075zcat=''
diff --git a/meta/recipes-devtools/perl/perl_5.14.2.bb b/meta/recipes-devtools/perl/perl_5.14.2.bb
index 00098553dd..09b2acb191 100644
--- a/meta/recipes-devtools/perl/perl_5.14.2.bb
+++ b/meta/recipes-devtools/perl/perl_5.14.2.bb
@@ -146,14 +146,14 @@ do_configure() {
146 ${@base_contains('DISTRO_FEATURES', 'largefile', '', 'do_nolargefile', d)} 146 ${@base_contains('DISTRO_FEATURES', 'largefile', '', 'do_nolargefile', d)}
147 147
148 # Update some paths in the configuration 148 # Update some paths in the configuration
149 sed -i -e 's,@DESTDIR@,${prefix},g' \ 149 sed -i -e 's,@ARCH@-thread-multi,,g' \
150 -e 's,@ARCH@-thread-multi,,g' \
151 -e 's,@ARCH@,${TARGET_ARCH}-${TARGET_OS},g' \ 150 -e 's,@ARCH@,${TARGET_ARCH}-${TARGET_OS},g' \
152 -e 's,@STAGINGDIR@,${STAGING_DIR_HOST},g' \ 151 -e 's,@STAGINGDIR@,${STAGING_DIR_HOST},g' \
153 -e "s%\([ \"^\',=]\+\)/usr/include\([ \"^\',=]\+\)%\1${STAGING_INCDIR}\2%g" \ 152 -e "s,@INCLUDEDIR@,${STAGING_INCDIR},g" \
154 -e "s%\([ \"^\',=]\+\)/usr/lib/\([ \"^\',=]\+\)%\1${libdir}/\2%g" \ 153 -e "s,@LIBDIR@,${libdir},g" \
155 -e "s%\([ \"^\',=]\+\)/usr/\([ \"^\',=]\+\)%\1${exec_prefix}/\2%g" \ 154 -e "s,@BASELIBDIR@,${base_libdir},g" \
156 -e "s%/perl5%/perl%g" \ 155 -e "s,@EXECPREFIX@,${exec_prefix},g" \
156 -e 's,@USRBIN@,${bindir},g' \
157 config.sh-${TARGET_ARCH}-${TARGET_OS} 157 config.sh-${TARGET_ARCH}-${TARGET_OS}
158 158
159 case "${TARGET_ARCH}" in 159 case "${TARGET_ARCH}" in