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>
This commit is contained in:
parent
c4788b7330
commit
3d3893d261
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
: Configure command line arguments.
|
: Configure command line arguments.
|
||||||
config_arg0='Configure'
|
config_arg0='Configure'
|
||||||
config_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'
|
config_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'
|
||||||
config_argc=28
|
config_argc=28
|
||||||
config_arg1='-des'
|
config_arg1='-des'
|
||||||
config_arg2='-Doptimize=-O2'
|
config_arg2='-Doptimize=-O2'
|
||||||
|
@ -22,11 +22,11 @@ config_arg3='-Dmyhostname=localhost'
|
||||||
config_arg4='-Dperladmin=root@localhost'
|
config_arg4='-Dperladmin=root@localhost'
|
||||||
config_arg5='-Dcc=gcc'
|
config_arg5='-Dcc=gcc'
|
||||||
config_arg6='-Dcf_by=Open Embedded'
|
config_arg6='-Dcf_by=Open Embedded'
|
||||||
config_arg7='-Dinstallprefix=@DESTDIR@'
|
config_arg7='-Dinstallprefix=@EXECPREFIX@'
|
||||||
config_arg8='-Dprefix=/usr'
|
config_arg8='-Dprefix=@EXECPREFIX@'
|
||||||
config_arg9='-Dvendorprefix=/usr'
|
config_arg9='-Dvendorprefix=@EXECPREFIX@'
|
||||||
config_arg10='-Dsiteprefix=/usr'
|
config_arg10='-Dsiteprefix=@EXECPREFIX@'
|
||||||
config_arg11='-Dotherlibdirs=/usr/lib/perl5/5.14.2'
|
config_arg11='-Dotherlibdirs=@LIBDIR@/perl/5.14.2'
|
||||||
config_arg12='-Duseshrplib'
|
config_arg12='-Duseshrplib'
|
||||||
config_arg13='-Dusethreads'
|
config_arg13='-Dusethreads'
|
||||||
config_arg14='-Duseithreads'
|
config_arg14='-Duseithreads'
|
||||||
|
@ -67,8 +67,8 @@ api_subversion='0'
|
||||||
api_version='14'
|
api_version='14'
|
||||||
api_versionstring='5.14.0'
|
api_versionstring='5.14.0'
|
||||||
ar='ar'
|
ar='ar'
|
||||||
archlib='/usr/lib/perl5/5.14.2/@ARCH@-thread-multi'
|
archlib='@LIBDIR@/perl/5.14.2/@ARCH@-thread-multi'
|
||||||
archlibexp='@STAGINGDIR@/usr/lib/perl5/5.14.2/@ARCH@-thread-multi'
|
archlibexp='@STAGINGDIR@@LIBDIR@/perl/5.14.2/@ARCH@-thread-multi'
|
||||||
archname64=''
|
archname64=''
|
||||||
archname='@ARCH@-thread-multi'
|
archname='@ARCH@-thread-multi'
|
||||||
archobjs=''
|
archobjs=''
|
||||||
|
@ -76,9 +76,9 @@ asctime_r_proto='REENTRANT_PROTO_B_SB'
|
||||||
awk='awk'
|
awk='awk'
|
||||||
baserev='5.0'
|
baserev='5.0'
|
||||||
bash=''
|
bash=''
|
||||||
bin='/usr/bin'
|
bin='@USRBIN@'
|
||||||
bin_ELF='define'
|
bin_ELF='define'
|
||||||
binexp='/usr/bin'
|
binexp='@USRBIN@'
|
||||||
bison='bison'
|
bison='bison'
|
||||||
byacc='byacc'
|
byacc='byacc'
|
||||||
c=''
|
c=''
|
||||||
|
@ -86,7 +86,7 @@ castflags='0'
|
||||||
cat='cat'
|
cat='cat'
|
||||||
cc='gcc'
|
cc='gcc'
|
||||||
cccdlflags='-fPIC'
|
cccdlflags='-fPIC'
|
||||||
ccdlflags='-Wl,-E -Wl,-rpath,/usr/lib/perl5/5.14.2/@ARCH@-thread-multi/CORE'
|
ccdlflags='-Wl,-E -Wl,-rpath,@LIBDIR@/perl/5.14.2/@ARCH@-thread-multi/CORE'
|
||||||
ccflags='-D_REENTRANT -D_GNU_SOURCE -fno-strict-aliasing -pipe -fstack-protector -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
|
ccflags='-D_REENTRANT -D_GNU_SOURCE -fno-strict-aliasing -pipe -fstack-protector -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
|
||||||
ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
|
ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
|
||||||
ccname='gcc'
|
ccname='gcc'
|
||||||
|
@ -602,9 +602,9 @@ fpossize='16'
|
||||||
fpostype='fpos_t'
|
fpostype='fpos_t'
|
||||||
freetype='void'
|
freetype='void'
|
||||||
from=':'
|
from=':'
|
||||||
full_ar='/usr/bin/ar'
|
full_ar='ar'
|
||||||
full_csh='csh'
|
full_csh='csh'
|
||||||
full_sed='/bin/sed'
|
full_sed='sed'
|
||||||
gccansipedantic=''
|
gccansipedantic=''
|
||||||
gccosandvers=''
|
gccosandvers=''
|
||||||
gccversion='4.5.1'
|
gccversion='4.5.1'
|
||||||
|
@ -631,7 +631,7 @@ getspnam_r_proto='REENTRANT_PROTO_I_CSBWR'
|
||||||
gidsign='1'
|
gidsign='1'
|
||||||
gidsize='4'
|
gidsize='4'
|
||||||
gidtype='gid_t'
|
gidtype='gid_t'
|
||||||
glibpth='/usr/shlib /lib /usr/lib /usr/lib/386 /lib/386 /usr/ccs/lib /usr/ucblib /usr/local/lib '
|
glibpth='@EXECPREFIX@/shlib @BASELIBDIR@ @LIBDIR@ @LIBDIR@/386 @BASELIBDIR@/386 @EXECPREFIX@/ccs/lib @EXECPREFIX@/ucblib @EXECPREFIX@/local/lib '
|
||||||
gmake='gmake'
|
gmake='gmake'
|
||||||
gmtime_r_proto='REENTRANT_PROTO_S_TS'
|
gmtime_r_proto='REENTRANT_PROTO_S_TS'
|
||||||
gnulibc_version='2.12.1'
|
gnulibc_version='2.12.1'
|
||||||
|
@ -745,35 +745,35 @@ inc_version_list=' '
|
||||||
inc_version_list_init='0'
|
inc_version_list_init='0'
|
||||||
incpath=''
|
incpath=''
|
||||||
inews=''
|
inews=''
|
||||||
initialinstalllocation='/usr/bin'
|
initialinstalllocation='@USRBIN@'
|
||||||
installarchlib='@DESTDIR@/lib/perl5/5.14.2/@ARCH@-thread-multi'
|
installarchlib='@LIBDIR@/perl/5.14.2/@ARCH@-thread-multi'
|
||||||
installbin='@DESTDIR@/bin'
|
installbin='@USRBIN@'
|
||||||
installhtml1dir=''
|
installhtml1dir=''
|
||||||
installhtml3dir=''
|
installhtml3dir=''
|
||||||
installman1dir=''
|
installman1dir=''
|
||||||
installman3dir=''
|
installman3dir=''
|
||||||
installprefix='@DESTDIR@'
|
installprefix='@EXECPREFIX@'
|
||||||
installprefixexp='@DESTDIR@'
|
installprefixexp='@EXECPREFIX@'
|
||||||
installprivlib='@DESTDIR@/lib/perl5/5.14.2'
|
installprivlib='@LIBDIR@/perl/5.14.2'
|
||||||
installscript='@DESTDIR@/bin'
|
installscript='@USRBIN@'
|
||||||
installsitearch='@DESTDIR@/lib/perl5/site_perl/5.14.2/@ARCH@-thread-multi'
|
installsitearch='@LIBDIR@/perl/site_perl/5.14.2/@ARCH@-thread-multi'
|
||||||
installsitebin='@DESTDIR@/bin'
|
installsitebin='@USRBIN@'
|
||||||
installsitehtml1dir=''
|
installsitehtml1dir=''
|
||||||
installsitehtml3dir=''
|
installsitehtml3dir=''
|
||||||
installsitelib='@DESTDIR@/lib/perl5/site_perl/5.14.2'
|
installsitelib='@LIBDIR@/perl/site_perl/5.14.2'
|
||||||
installsiteman1dir=''
|
installsiteman1dir=''
|
||||||
installsiteman3dir=''
|
installsiteman3dir=''
|
||||||
installsitescript='@DESTDIR@/bin'
|
installsitescript='@USRBIN@'
|
||||||
installstyle='lib/perl5'
|
installstyle='lib/perl'
|
||||||
installusrbinperl='define'
|
installusrbinperl='define'
|
||||||
installvendorarch='@DESTDIR@/lib/perl5/vendor_perl/5.14.2/@ARCH@-thread-multi'
|
installvendorarch='@LIBDIR@/perl/vendor_perl/5.14.2/@ARCH@-thread-multi'
|
||||||
installvendorbin='@DESTDIR@/bin'
|
installvendorbin='@USRBIN@'
|
||||||
installvendorhtml1dir=''
|
installvendorhtml1dir=''
|
||||||
installvendorhtml3dir=''
|
installvendorhtml3dir=''
|
||||||
installvendorlib='@DESTDIR@/lib/perl5/vendor_perl/5.14.2'
|
installvendorlib='@LIBDIR@/perl/vendor_perl/5.14.2'
|
||||||
installvendorman1dir=''
|
installvendorman1dir=''
|
||||||
installvendorman3dir=''
|
installvendorman3dir=''
|
||||||
installvendorscript='@DESTDIR@/bin'
|
installvendorscript='@USRBIN@'
|
||||||
intsize='4'
|
intsize='4'
|
||||||
issymlink='test -h'
|
issymlink='test -h'
|
||||||
ivdformat='"ld"'
|
ivdformat='"ld"'
|
||||||
|
@ -787,14 +787,14 @@ ldflags_uselargefiles=''
|
||||||
ldlibpthname='LD_LIBRARY_PATH'
|
ldlibpthname='LD_LIBRARY_PATH'
|
||||||
less='less'
|
less='less'
|
||||||
lib_ext='.a'
|
lib_ext='.a'
|
||||||
libc='/lib/libc-2.12.1.so'
|
libc='@BASELIBDIR@/libc-2.12.1.so'
|
||||||
libperl='libperl.so'
|
libperl='libperl.so'
|
||||||
libpth='/lib /usr/lib'
|
libpth='@BASELIBDIR@ @LIBDIR@'
|
||||||
libs='-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lpthread -lc'
|
libs='-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lpthread -lc'
|
||||||
libsdirs=' /usr/lib'
|
libsdirs=' @LIBDIR@'
|
||||||
libsfiles=' libnsl.so libgdbm.so libdb.so libdl.so libm.so libcrypt.so libutil.so libpthread.so libc.so'
|
libsfiles=' libnsl.so libgdbm.so libdb.so libdl.so libm.so libcrypt.so libutil.so libpthread.so libc.so'
|
||||||
libsfound=' /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'
|
libsfound=' @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'
|
||||||
libspath=' /lib /usr/lib'
|
libspath=' @BASELIBDIR@ @LIBDIR@'
|
||||||
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 gdbm_compat'
|
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 gdbm_compat'
|
||||||
libswanted_uselargefiles=''
|
libswanted_uselargefiles=''
|
||||||
line=''
|
line=''
|
||||||
|
@ -803,8 +803,8 @@ lkflags=''
|
||||||
ln='ln'
|
ln='ln'
|
||||||
lns='/bin/ln -s'
|
lns='/bin/ln -s'
|
||||||
localtime_r_proto='REENTRANT_PROTO_S_TS'
|
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'
|
locincpth='@EXECPREFIX@/local/include /opt/local/include @EXECPREFIX@/gnu/include /opt/gnu/include @EXECPREFIX@/GNU/include /opt/GNU/include'
|
||||||
loclibpth='/usr/local/lib /opt/local/lib /usr/gnu/lib /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib'
|
loclibpth='@EXECPREFIX@/local/lib /opt/local/lib @EXECPREFIX@/gnu/lib /opt/gnu/lib @EXECPREFIX@/GNU/lib /opt/GNU/lib'
|
||||||
longlongsize='8'
|
longlongsize='8'
|
||||||
lp=''
|
lp=''
|
||||||
lpr=''
|
lpr=''
|
||||||
|
@ -864,28 +864,28 @@ optimize='-O2'
|
||||||
orderlib='false'
|
orderlib='false'
|
||||||
osname='linux'
|
osname='linux'
|
||||||
osvers='2.6.37-rc5-yocto-standard+'
|
osvers='2.6.37-rc5-yocto-standard+'
|
||||||
otherlibdirs='/usr/lib/perl5/5.14.2'
|
otherlibdirs='@LIBDIR@/perl/5.14.2'
|
||||||
package='perl5'
|
package='perl5'
|
||||||
pager='/usr/bin/less -isr'
|
pager='/usr/bin/less -isr'
|
||||||
passcat='cat /etc/passwd'
|
passcat='cat /etc/passwd'
|
||||||
patchlevel='14'
|
patchlevel='14'
|
||||||
path_sep=':'
|
path_sep=':'
|
||||||
perl5='/usr/bin/perl'
|
perl5='@USRBIN@/perl'
|
||||||
perl=''
|
perl=''
|
||||||
perl_patchlevel=''
|
perl_patchlevel=''
|
||||||
perladmin='root@localhost'
|
perladmin='root@localhost'
|
||||||
perllibs='-lnsl -ldl -lm -lcrypt -lutil -lpthread -lc'
|
perllibs='-lnsl -ldl -lm -lcrypt -lutil -lpthread -lc'
|
||||||
perlpath='/usr/bin/perl'
|
perlpath='@USRBIN@/perl'
|
||||||
pg='pg'
|
pg='pg'
|
||||||
phostname=''
|
phostname=''
|
||||||
pidtype='pid_t'
|
pidtype='pid_t'
|
||||||
plibpth=''
|
plibpth=''
|
||||||
pmake=''
|
pmake=''
|
||||||
pr=''
|
pr=''
|
||||||
prefix='/usr'
|
prefix='@EXECPREFIX@'
|
||||||
prefixexp='/usr'
|
prefixexp='@EXECPREFIX@'
|
||||||
privlib='/usr/lib/perl5/5.14.2'
|
privlib='@LIBDIR@/perl/5.14.2'
|
||||||
privlibexp='/usr/lib/perl5/5.14.2'
|
privlibexp='@LIBDIR@/perl/5.14.2'
|
||||||
procselfexe='"/proc/self/exe"'
|
procselfexe='"/proc/self/exe"'
|
||||||
prototype='define'
|
prototype='define'
|
||||||
randbits='48'
|
randbits='48'
|
||||||
|
@ -910,8 +910,8 @@ sPRIfldbl='"Lf"'
|
||||||
sPRIgldbl='"Lg"'
|
sPRIgldbl='"Lg"'
|
||||||
sSCNfldbl='"Lf"'
|
sSCNfldbl='"Lf"'
|
||||||
sched_yield='sched_yield()'
|
sched_yield='sched_yield()'
|
||||||
scriptdir='/usr/bin'
|
scriptdir='@USRBIN@'
|
||||||
scriptdirexp='/usr/bin'
|
scriptdirexp='@USRBIN@'
|
||||||
sed='sed'
|
sed='sed'
|
||||||
seedfunc='srand48'
|
seedfunc='srand48'
|
||||||
selecttype='fd_set *'
|
selecttype='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
|
||||||
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_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'
|
sig_size='69'
|
||||||
signal_t='void'
|
signal_t='void'
|
||||||
sitearch='/usr/lib/perl5/site_perl/5.14.2/@ARCH@-thread-multi'
|
sitearch='@LIBDIR@/perl/site_perl/5.14.2/@ARCH@-thread-multi'
|
||||||
sitearchexp='/usr/lib/perl5/site_perl/5.14.2/@ARCH@-thread-multi'
|
sitearchexp='@LIBDIR@/perl/site_perl/5.14.2/@ARCH@-thread-multi'
|
||||||
sitebin='/usr/bin'
|
sitebin='@USRBIN@'
|
||||||
sitebinexp='/usr/bin'
|
sitebinexp='@USRBIN@'
|
||||||
sitehtml1dir=''
|
sitehtml1dir=''
|
||||||
sitehtml1direxp=''
|
sitehtml1direxp=''
|
||||||
sitehtml3dir=''
|
sitehtml3dir=''
|
||||||
sitehtml3direxp=''
|
sitehtml3direxp=''
|
||||||
sitelib='/usr/lib/perl5/site_perl/5.14.2'
|
sitelib='@LIBDIR@/perl/site_perl/5.14.2'
|
||||||
sitelib_stem='/usr/lib/perl5/site_perl'
|
sitelib_stem='@LIBDIR@/perl/site_perl'
|
||||||
sitelibexp='/usr/lib/perl5/site_perl/5.14.2'
|
sitelibexp='@LIBDIR@/perl/site_perl/5.14.2'
|
||||||
siteman1dir=''
|
siteman1dir=''
|
||||||
siteman1direxp=''
|
siteman1direxp=''
|
||||||
siteman3dir=''
|
siteman3dir=''
|
||||||
siteman3direxp=''
|
siteman3direxp=''
|
||||||
siteprefix='/usr'
|
siteprefix='@EXECPREFIX@'
|
||||||
siteprefixexp='/usr'
|
siteprefixexp='@EXECPREFIX@'
|
||||||
sitescript='/usr/bin'
|
sitescript='@USRBIN@'
|
||||||
sitescriptexp='/usr/bin'
|
sitescriptexp='@USRBIN@'
|
||||||
sizetype='size_t'
|
sizetype='size_t'
|
||||||
sleep=''
|
sleep=''
|
||||||
smail=''
|
smail=''
|
||||||
|
@ -970,7 +970,7 @@ srand48_r_proto='REENTRANT_PROTO_I_LS'
|
||||||
srandom_r_proto='REENTRANT_PROTO_I_TS'
|
srandom_r_proto='REENTRANT_PROTO_I_TS'
|
||||||
src='.'
|
src='.'
|
||||||
ssizetype='ssize_t'
|
ssizetype='ssize_t'
|
||||||
startperl='#!/usr/bin/perl'
|
startperl='#!@USRBIN@/perl'
|
||||||
startsh='#!/bin/sh'
|
startsh='#!/bin/sh'
|
||||||
static_ext=' '
|
static_ext=' '
|
||||||
stdchar='char'
|
stdchar='char'
|
||||||
|
@ -981,17 +981,17 @@ stdio_filbuf=''
|
||||||
stdio_ptr='((fp)->_IO_read_ptr)'
|
stdio_ptr='((fp)->_IO_read_ptr)'
|
||||||
stdio_stream_array=''
|
stdio_stream_array=''
|
||||||
strerror_r_proto='REENTRANT_PROTO_B_IBW'
|
strerror_r_proto='REENTRANT_PROTO_B_IBW'
|
||||||
strings='/usr/include/string.h'
|
strings='@INCLUDEDIR@/string.h'
|
||||||
submit=''
|
submit=''
|
||||||
subversion='2'
|
subversion='2'
|
||||||
sysman='/usr/share/man/man1'
|
sysman='@EXECPREFIX@/share/man/man1'
|
||||||
tail=''
|
tail=''
|
||||||
tar=''
|
tar=''
|
||||||
targetarch=''
|
targetarch=''
|
||||||
tbl=''
|
tbl=''
|
||||||
tee=''
|
tee=''
|
||||||
test='test'
|
test='test'
|
||||||
timeincl='/usr/include/sys/time.h /usr/include/time.h '
|
timeincl='@INCLUDEDIR@/sys/time.h @INCLUDEDIR@/time.h '
|
||||||
timetype='time_t'
|
timetype='time_t'
|
||||||
tmpnam_r_proto='REENTRANT_PROTO_B_B'
|
tmpnam_r_proto='REENTRANT_PROTO_B_B'
|
||||||
to=':'
|
to=':'
|
||||||
|
@ -1037,7 +1037,7 @@ usesocks='undef'
|
||||||
usethreads='define'
|
usethreads='define'
|
||||||
usevendorprefix='define'
|
usevendorprefix='define'
|
||||||
usevfork='false'
|
usevfork='false'
|
||||||
usrinc='/usr/include'
|
usrinc='@INCLUDEDIR@'
|
||||||
uuname=''
|
uuname=''
|
||||||
uvXUformat='"lX"'
|
uvXUformat='"lX"'
|
||||||
uvoformat='"lo"'
|
uvoformat='"lo"'
|
||||||
|
@ -1045,31 +1045,31 @@ uvtype='unsigned long'
|
||||||
uvuformat='"lu"'
|
uvuformat='"lu"'
|
||||||
uvxformat='"lx"'
|
uvxformat='"lx"'
|
||||||
vaproto='define'
|
vaproto='define'
|
||||||
vendorarch='/usr/lib/perl5/vendor_perl/5.14.2/@ARCH@-thread-multi'
|
vendorarch='@LIBDIR@/perl/vendor_perl/5.14.2/@ARCH@-thread-multi'
|
||||||
vendorarchexp='/usr/lib/perl5/vendor_perl/5.14.2/@ARCH@-thread-multi'
|
vendorarchexp='@LIBDIR@/perl/vendor_perl/5.14.2/@ARCH@-thread-multi'
|
||||||
vendorbin='/usr/bin'
|
vendorbin='@USRBIN@'
|
||||||
vendorbinexp='/usr/bin'
|
vendorbinexp='@USRBIN@'
|
||||||
vendorhtml1dir=' '
|
vendorhtml1dir=' '
|
||||||
vendorhtml1direxp=''
|
vendorhtml1direxp=''
|
||||||
vendorhtml3dir=' '
|
vendorhtml3dir=' '
|
||||||
vendorhtml3direxp=''
|
vendorhtml3direxp=''
|
||||||
vendorlib='/usr/lib/perl5/vendor_perl/5.14.2'
|
vendorlib='@LIBDIR@/perl/vendor_perl/5.14.2'
|
||||||
vendorlib_stem='/usr/lib/perl5/vendor_perl'
|
vendorlib_stem='@LIBDIR@/perl/vendor_perl'
|
||||||
vendorlibexp='/usr/lib/perl5/vendor_perl/5.14.2'
|
vendorlibexp='@LIBDIR@/perl/vendor_perl/5.14.2'
|
||||||
vendorman1dir=' '
|
vendorman1dir=' '
|
||||||
vendorman1direxp=''
|
vendorman1direxp=''
|
||||||
vendorman3dir=' '
|
vendorman3dir=' '
|
||||||
vendorman3direxp=''
|
vendorman3direxp=''
|
||||||
vendorprefix='/usr'
|
vendorprefix='/usr'
|
||||||
vendorprefixexp='/usr'
|
vendorprefixexp='/usr'
|
||||||
vendorscript='/usr/bin'
|
vendorscript='@USRBIN@'
|
||||||
vendorscriptexp='/usr/bin'
|
vendorscriptexp='@USRBIN@'
|
||||||
version='5.14.2'
|
version='5.14.2'
|
||||||
version_patchlevel_string='version 14 subversion 2'
|
version_patchlevel_string='version 14 subversion 2'
|
||||||
versiononly='undef'
|
versiononly='undef'
|
||||||
vi=''
|
vi=''
|
||||||
voidflags='15'
|
voidflags='15'
|
||||||
xlibpth='/usr/lib/386 /lib/386'
|
xlibpth='@LIBDIR@/386 @BASELIBDIR@/386'
|
||||||
yacc='yacc'
|
yacc='yacc'
|
||||||
yaccflags=''
|
yaccflags=''
|
||||||
zcat=''
|
zcat=''
|
||||||
|
|
|
@ -146,14 +146,14 @@ do_configure() {
|
||||||
${@base_contains('DISTRO_FEATURES', 'largefile', '', 'do_nolargefile', d)}
|
${@base_contains('DISTRO_FEATURES', 'largefile', '', 'do_nolargefile', d)}
|
||||||
|
|
||||||
# Update some paths in the configuration
|
# Update some paths in the configuration
|
||||||
sed -i -e 's,@DESTDIR@,${prefix},g' \
|
sed -i -e 's,@ARCH@-thread-multi,,g' \
|
||||||
-e 's,@ARCH@-thread-multi,,g' \
|
|
||||||
-e 's,@ARCH@,${TARGET_ARCH}-${TARGET_OS},g' \
|
-e 's,@ARCH@,${TARGET_ARCH}-${TARGET_OS},g' \
|
||||||
-e 's,@STAGINGDIR@,${STAGING_DIR_HOST},g' \
|
-e 's,@STAGINGDIR@,${STAGING_DIR_HOST},g' \
|
||||||
-e "s%\([ \"^\',=]\+\)/usr/include\([ \"^\',=]\+\)%\1${STAGING_INCDIR}\2%g" \
|
-e "s,@INCLUDEDIR@,${STAGING_INCDIR},g" \
|
||||||
-e "s%\([ \"^\',=]\+\)/usr/lib/\([ \"^\',=]\+\)%\1${libdir}/\2%g" \
|
-e "s,@LIBDIR@,${libdir},g" \
|
||||||
-e "s%\([ \"^\',=]\+\)/usr/\([ \"^\',=]\+\)%\1${exec_prefix}/\2%g" \
|
-e "s,@BASELIBDIR@,${base_libdir},g" \
|
||||||
-e "s%/perl5%/perl%g" \
|
-e "s,@EXECPREFIX@,${exec_prefix},g" \
|
||||||
|
-e 's,@USRBIN@,${bindir},g' \
|
||||||
config.sh-${TARGET_ARCH}-${TARGET_OS}
|
config.sh-${TARGET_ARCH}-${TARGET_OS}
|
||||||
|
|
||||||
case "${TARGET_ARCH}" in
|
case "${TARGET_ARCH}" in
|
||||||
|
|
Loading…
Reference in New Issue