Adding grep to the fray.
This commit is contained in:
K. Richard Pixley
parent
846058edd8
commit
bc58b41dbc
2 changed files with 128 additions and 112 deletions
232
configure
vendored
232
configure
vendored
|
|
@ -55,11 +55,13 @@ hostsubdir=
|
|||
Makefile=Makefile
|
||||
Makefile_in=Makefile.in
|
||||
norecurse=
|
||||
recursing=
|
||||
removing=
|
||||
srcdir=
|
||||
srctrigger=
|
||||
target=
|
||||
targets=
|
||||
commontargets=
|
||||
targetsubdir=
|
||||
template=
|
||||
verbose=
|
||||
|
|
@ -69,6 +71,7 @@ do
|
|||
case ${arg} in
|
||||
-ansi | +a*)
|
||||
ansi=true
|
||||
clib=clib
|
||||
;;
|
||||
-destdir=* | +destdir=* | +destdi=* | +destd=* | +dest=* | +des=* | +de=* | +d=*)
|
||||
destdir=`echo ${arg} | sed 's/[+-]d[a-z]*=//'`
|
||||
|
|
@ -78,7 +81,7 @@ do
|
|||
| +l=*)
|
||||
languages="${languages} `echo ${arg} | sed 's/[+-]l[a-z]*=//'`"
|
||||
;;
|
||||
-gas | +g)
|
||||
-gas | +g*)
|
||||
gas=yes
|
||||
;;
|
||||
-help | +h*)
|
||||
|
|
@ -90,13 +93,16 @@ do
|
|||
-norecurse | +no*)
|
||||
norecurse=true
|
||||
;;
|
||||
-recursing)
|
||||
recursing=true
|
||||
;;
|
||||
-rm | +r*)
|
||||
removing=${arg}
|
||||
;;
|
||||
# -srcdir=* | +srcdir=* | +srcdi=* | +srcd=* | +src=* | +sr=* | +s=*)
|
||||
# srcdir=`echo ${arg} | sed 's/[+-]s[a-z]*=//'`
|
||||
# ;;
|
||||
-subdirs | +su*)
|
||||
-subdirs | +f* | +su*)
|
||||
subdirs=${arg}
|
||||
;;
|
||||
-target=* | +target=* | +targe=* | +targ=* | +tar=* | +ta=*)
|
||||
|
|
@ -110,7 +116,7 @@ do
|
|||
-template=* | +template=* | +templat=* | +templa=* | +templ=* | +temp=* | +tem=* | +te=*)
|
||||
template=`echo ${arg} | sed 's/[+-]template=//'`
|
||||
;;
|
||||
-verbose | +v*)
|
||||
-v | -verbose | +v*)
|
||||
verbose=${arg}
|
||||
;;
|
||||
-* | +*)
|
||||
|
|
@ -132,7 +138,6 @@ done
|
|||
|
||||
if [ -n "${verbose}" ] ; then
|
||||
echo `pwd`/configure $*
|
||||
echo targets=\"${targets}\"
|
||||
fi
|
||||
|
||||
# process host and target only if not rebuilding configure itself or removing.
|
||||
|
|
@ -141,7 +146,7 @@ if [ -z "${template}" -a -z "${removing}" -a -z "${fatal}" ] ; then
|
|||
if [ -z "${hosts}" ] ; then
|
||||
(echo ;
|
||||
echo "configure: No HOST specified." ;
|
||||
echo) 2>&1
|
||||
echo) 1>&2
|
||||
fatal=true
|
||||
fi
|
||||
fi
|
||||
|
|
@ -179,7 +184,7 @@ fi
|
|||
# script appropriate for this directory. For more information, check
|
||||
# any existing configure script.
|
||||
|
||||
configdirs="libiberty bfd binutils bison gcc readline ld gas gnulib ${clib} gdb make prms "
|
||||
configdirs="libiberty bfd binutils bison gcc readline ld gas gnulib ${clib} gdb make grep prms "
|
||||
srctrigger=README.configure
|
||||
srcname="gnu development package"
|
||||
|
||||
|
|
@ -188,7 +193,7 @@ srcname="gnu development package"
|
|||
# are we rebuilding config itself?
|
||||
if [ -n "${template}" ] ; then
|
||||
if [ ! -r ${template} ] ; then
|
||||
echo "Can't find template ${template}."
|
||||
echo '***' "Can't find template ${template}." 1>&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
|
@ -209,12 +214,12 @@ if [ -n "${template}" ] ; then
|
|||
|
||||
if [ -r configure.in ] ; then
|
||||
if [ -z "`grep '^# per\-host:' configure.in`" ] ; then
|
||||
echo `pwd`/configure.in has no "per-host:" line.
|
||||
echo '***' `pwd`/configure.in has no "per-host:" line. 1>&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -z "`grep '^# per\-target:' configure.in`" ] ; then
|
||||
echo `pwd`/configure.in has no "per-target:" line.
|
||||
echo '***' `pwd`/configure.in has no "per-target:" line. 1>&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
|
@ -247,7 +252,21 @@ if [ -n "${template}" ] ; then
|
|||
rm template.new
|
||||
# mv configure configure.old
|
||||
mv configure.new configure
|
||||
echo Rebuilt configure in `pwd`
|
||||
|
||||
if [ -n "${verbose}" ] ; then
|
||||
echo Rebuilt configure in `pwd`
|
||||
fi
|
||||
|
||||
# Now update config.sub from the template directory.
|
||||
if echo "$template" | grep -s 'configure$' ; then
|
||||
cp `echo "$template" | sed s/configure$/config.sub/` ./config.sub.new
|
||||
# mv config.sub config.sub.old
|
||||
mv config.sub.new config.sub
|
||||
|
||||
if [ -n "${verbose}" ] ; then
|
||||
echo Rebuilt config.sub in `pwd`
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -z "${norecurse}" ] ; then
|
||||
# If template is relative path, make it absolute for recursing.
|
||||
|
|
@ -273,10 +292,12 @@ if [ -n "${template}" ] ; then
|
|||
(cd $i ;
|
||||
./configure +template=${template} ${verbose})
|
||||
else
|
||||
echo No configure script in `pwd`/$i
|
||||
echo Warning: No configure script in `pwd`/$i
|
||||
fi
|
||||
else
|
||||
echo Warning: directory $i is missing.
|
||||
if [ -n "${verbose}" ] ; then
|
||||
echo Warning: directory $i is missing.
|
||||
fi
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
|
@ -287,7 +308,7 @@ fi
|
|||
|
||||
# some sanity checks on configure.in
|
||||
if [ -z "${srctrigger}" ] ; then
|
||||
echo srctrigger not set in configure.in. `pwd` not configured.
|
||||
echo Warning: srctrigger not set in configure.in. `pwd` not configured.
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
|
@ -298,22 +319,33 @@ for host in ${hosts} ; do
|
|||
defaulttargets=true
|
||||
fi
|
||||
|
||||
result=`/bin/sh ./config.sub ${host}`
|
||||
host_cpu=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
|
||||
host_vendor=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
|
||||
host_os=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
|
||||
host=${host_cpu}-${host_vendor}-${host_os}
|
||||
host_makefile_frag=config/hmake-${host}
|
||||
|
||||
#### configure.in per-host parts come in here.
|
||||
|
||||
## end of per-host part.
|
||||
|
||||
|
||||
for target in ${targets} ; do
|
||||
|
||||
if [ -n "${verbose}" ] ; then
|
||||
echo " target=\"${target}\""
|
||||
fi
|
||||
|
||||
result=`/bin/sh ./config.sub ${target}`
|
||||
target_cpu=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
|
||||
target_vendor=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
|
||||
target_os=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
|
||||
target=${target_cpu}-${target_vendor}-${target_os}
|
||||
target_makefile_frag=config/tmake-${target}
|
||||
|
||||
#### configure.in per-target parts come in here.
|
||||
|
||||
#
|
||||
# Local Variables:
|
||||
# fill-column: 131
|
||||
# End:
|
||||
#
|
||||
## end of per-target part.
|
||||
|
||||
# Temporarily, we support only direct subdir builds.
|
||||
|
|
@ -325,7 +357,7 @@ for host in ${hosts} ; do
|
|||
if [ -d "${hostsubdir}" ] ; then
|
||||
rm -rf ${hostsubdir}/${targetsubdir}
|
||||
|
||||
if [ -z "`(ls ${hostsubdir}) 2>&1 | grep Target-`" ] ; then
|
||||
if [ -z "`(ls ${hostsubdir}) 2>&1 | grep Target- | grep -v Target-independent`" ] ; then
|
||||
rm -rf ${hostsubdir}
|
||||
fi
|
||||
else
|
||||
|
|
@ -338,21 +370,32 @@ for host in ${hosts} ; do
|
|||
if [ -n "${subdirs}" ] ; then
|
||||
# check for existing status before allowing forced subdirs.
|
||||
if [ -f ${Makefile} ] ; then
|
||||
echo "${Makefile} already exists in source directory. `pwd` not configured."
|
||||
echo '***' "${Makefile} already exists in source directory. `pwd` not configured." 1>&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ ! -d ${hostsubdir} ] ; then mkdir ${hostsubdir} ; fi
|
||||
cd ${hostsubdir}
|
||||
|
||||
if [ ! -d ${targetsubdir} ] ; then mkdir ${targetsubdir} ; fi
|
||||
if [ ! -d ${targetsubdir} ] ; then
|
||||
if [ -z "${commontargets}" ] ; then
|
||||
mkdir ${targetsubdir}
|
||||
else
|
||||
if [ ! -d Target-independent ] ; then
|
||||
mkdir Target-independent
|
||||
fi
|
||||
|
||||
${symbolic_link} Target-independent ${targetsubdir}
|
||||
fi # if target independent
|
||||
fi # if no target dir yet
|
||||
|
||||
cd ${targetsubdir}
|
||||
|
||||
srcdir=../..
|
||||
else
|
||||
# if not subdir builds, then make sure none exist.
|
||||
if [ -n "`(ls .) 2>&1 | grep Host-`" ] ; then
|
||||
echo "Configured subdirs exist. `pwd` not configured."
|
||||
echo '***' "Configured subdirs exist. `pwd` not configured." 1>&2
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
|
@ -368,12 +411,12 @@ for host in ${hosts} ; do
|
|||
|
||||
if [ -n "${srctrigger}" -a ! -r ${srcdir}/${srctrigger} ] ; then
|
||||
if [ -z "${srcdirdefaulted}" ] ; then
|
||||
echo "${progname}: Can't find ${srcname} sources in `pwd`/${srcdir}" 1>&2
|
||||
echo '***' "${progname}: Can't find ${srcname} sources in `pwd`/${srcdir}" 1>&2
|
||||
else
|
||||
echo "${progname}: Can't find ${srcname} sources in `pwd`/. or `pwd`/.." 1>&2
|
||||
echo '***' "${progname}: Can't find ${srcname} sources in `pwd`/. or `pwd`/.." 1>&2
|
||||
fi
|
||||
|
||||
echo \(At least ${srctrigger} is missing.\) 1>&2
|
||||
echo '***' \(At least ${srctrigger} is missing.\) 1>&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
|
@ -387,8 +430,8 @@ for host in ${hosts} ; do
|
|||
set ${links}; link=$1; shift; links=$*
|
||||
|
||||
if [ ! -r ${srcdir}/${file} ] ; then
|
||||
echo "${progname}: cannot create a link \"${link}\"," 1>&2
|
||||
echo "since the file \"${file}\" does not exist." 1>&2
|
||||
echo '***' "${progname}: cannot create a link \"${link}\"," 1>&2
|
||||
echo '***' "since the file \"${file}\" does not exist." 1>&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
|
@ -398,10 +441,13 @@ for host in ${hosts} ; do
|
|||
${symbolic_link} ${srcdir}/${file} ${link} 2>/dev/null || ${hard_link} ${srcdir}/${file} ${link}
|
||||
|
||||
if [ ! -r ${link} ] ; then
|
||||
echo "${progname}: unable to link \"${link}\" to \"${srcdir}/${file}\"." 1>&2
|
||||
echo '***' "${progname}: unable to link \"${link}\" to \"${srcdir}/${file}\"." 1>&2
|
||||
exit 1
|
||||
fi
|
||||
echo "Linked \"${link}\" to \"${srcdir}/${file}\"."
|
||||
|
||||
if [ -n "${verbose}" ] ; then
|
||||
echo "Linked \"${link}\" to \"${srcdir}/${file}\"."
|
||||
fi
|
||||
done
|
||||
|
||||
# Create a .gdbinit file which runs the one in srcdir
|
||||
|
|
@ -494,7 +540,9 @@ for host in ${hosts} ; do
|
|||
andusing=${using}
|
||||
fi
|
||||
|
||||
echo "Created \"${Makefile}\"" in `pwd`${andusing}.
|
||||
if [ -n "${verbose}" -o -z "${recursing}" ] ; then
|
||||
echo "Created \"${Makefile}\"" in `pwd`${andusing}.
|
||||
fi
|
||||
|
||||
#### configure.in post-target parts come in here.
|
||||
|
||||
|
|
@ -513,6 +561,26 @@ for host in ${hosts} ; do
|
|||
originaldir=`pwd`
|
||||
cd ${srcdir}
|
||||
fi
|
||||
|
||||
# If there are subdirectories, then recurse.
|
||||
if [ -z "${norecurse}" -a -n "${configdirs}" ] ; then
|
||||
for configdir in ${configdirs} ; do
|
||||
if [ -n "${verbose}" ] ; then
|
||||
echo Configuring ${configdir}...
|
||||
fi
|
||||
|
||||
if [ -d ${configdir} ] ; then
|
||||
(cd ${configdir} ;
|
||||
./configure -recursing ${host} +target=${target} \
|
||||
${verbose} ${subdirs} ${removing} +destdir=${destdir}) \
|
||||
| sed 's/^/ /'
|
||||
else
|
||||
if [ -n "${verbose}" ] ; then
|
||||
echo Warning: directory \"${configdir}\" is missing.
|
||||
fi
|
||||
fi
|
||||
done
|
||||
fi
|
||||
done # for each target
|
||||
|
||||
# Now build a Makefile for this host.
|
||||
|
|
@ -532,91 +600,33 @@ E!O!F
|
|||
fi
|
||||
done # for each host
|
||||
|
||||
# If there are subdirectories, then recurse.
|
||||
|
||||
if [ -n "${norecurse}" -o -z "${configdirs}" ] ; then exit 0 ; fi
|
||||
|
||||
# configdirs is not null
|
||||
for configdir in ${configdirs} ; do
|
||||
echo Configuring ${configdir}...
|
||||
specifics=
|
||||
commons=
|
||||
|
||||
if [ -n "${defaulttargets}" ] ; then
|
||||
for host in ${hosts} ; do
|
||||
if [ -d ${configdir}.${host} ] ; then
|
||||
newspecifics="${specifics} ${host}"
|
||||
specifics=${newspecifics}
|
||||
else
|
||||
newcommons="${commons} ${host}"
|
||||
commons=${newcommons}
|
||||
fi # if target specific
|
||||
done # for each host
|
||||
|
||||
if [ -n "${commons}" ] ; then
|
||||
if [ -d ${configdir} ] ; then
|
||||
(cd ${configdir} ;
|
||||
./configure ${commons} ${verbose} ${subdirs} ${removing} +destdir=${destdir}) \
|
||||
| sed 's/^/ /'
|
||||
else
|
||||
echo Warning: directory \"${configdir}\" is missing.
|
||||
fi
|
||||
fi # if any common hosts
|
||||
|
||||
if [ -n "${specifics}" ] ; then
|
||||
for host in ${specifics} ; do
|
||||
echo Configuring target specific directory ${configdir}.${host}...
|
||||
(cd ${configdir}.${host} ;
|
||||
./configure ${host} ${verbose} ${subdirs} ${removing} +destdir=${destdir}) \
|
||||
| sed 's/^/ /'
|
||||
done # for host in specifics
|
||||
fi # if there are any specifics
|
||||
else
|
||||
|
||||
for target in ${targets} ; do
|
||||
if [ -d ${configdir}.${target} ] ; then
|
||||
newspecifics="${specifics} ${target}"
|
||||
specifics=${newspecifics}
|
||||
else
|
||||
newcommons="${commons} +target=${target}"
|
||||
commons=${newcommons}
|
||||
fi
|
||||
|
||||
done # check for target specific dir override
|
||||
|
||||
if [ -n "${verbose}" ] ; then
|
||||
echo " "commons=\"${commons}\"
|
||||
echo " "specifics=\"${specifics}\"
|
||||
fi # if verbose
|
||||
|
||||
if [ -n "${commons}" ] ; then
|
||||
if [ -d ${configdir} ] ; then
|
||||
(cd ${configdir} ;
|
||||
./configure ${hosts} ${verbose} ${subdirs} ${removing} \
|
||||
${commons} +destdir=${destdir}) \
|
||||
| sed 's/^/ /'
|
||||
else
|
||||
echo Warning: directory \"${configdir}\" is missing.
|
||||
fi
|
||||
fi # if any commons
|
||||
|
||||
if [ -n "${specifics}" ] ; then
|
||||
for target in ${specifics} ; do
|
||||
echo Configuring target specific directory ${configdir}.${target}...
|
||||
(cd ${configdir}.${target} ;
|
||||
./configure ${hosts} ${verbose} ${subdirs} ${removing} \
|
||||
"+target=${target}" +destdir=${destdir}) \
|
||||
| sed 's/^/ /'
|
||||
done
|
||||
fi # if any specifics
|
||||
fi # not default targets
|
||||
done
|
||||
|
||||
exit 0
|
||||
|
||||
#
|
||||
# $Log$
|
||||
# Revision 1.26 1991/08/07 19:21:32 rich
|
||||
# Revision 1.32 1991/08/25 20:18:20 rich
|
||||
# Adding grep to the fray.
|
||||
#
|
||||
# Revision 1.31 1991/08/23 04:50:57 rich
|
||||
# Minor config polish.
|
||||
#
|
||||
# Revision 1.22 1991/08/23 03:31:43 rich
|
||||
# Minor polish & config mapping.
|
||||
#
|
||||
# Revision 1.30 1991/08/22 07:15:51 rich
|
||||
# Three part names, etc.
|
||||
#
|
||||
# Revision 1.29 1991/08/20 04:56:51 rich
|
||||
# revisiting error messages
|
||||
#
|
||||
# Revision 1.28 1991/08/16 19:22:17 rich
|
||||
# This is the commontargets change and should be considered
|
||||
# experimental.
|
||||
#
|
||||
# Revision 1.27 1991/08/08 01:14:13 rich
|
||||
# allow +f to stand in for +subdirs
|
||||
#
|
||||
# Revision 1.26 1991/08/07 19:21:32 rich
|
||||
# +forcesubdirs -> +subdirs
|
||||
#
|
||||
# Revision 1.25 1991/08/07 07:05:30 rich
|
||||
|
|
|
|||
|
|
@ -3,10 +3,16 @@
|
|||
# script appropriate for this directory. For more information, check
|
||||
# any existing configure script.
|
||||
|
||||
configdirs="libiberty bfd binutils bison gcc readline ld gas gnulib ${clib} gdb make prms "
|
||||
configdirs="libiberty bfd binutils bison gcc readline ld gas gnulib ${clib} gdb make grep prms "
|
||||
srctrigger=README.configure
|
||||
srcname="gnu development package"
|
||||
|
||||
# per-host:
|
||||
|
||||
# per-target:
|
||||
|
||||
#
|
||||
# Local Variables:
|
||||
# fill-column: 131
|
||||
# End:
|
||||
#
|
||||
|
|
|
|||
Loading…
Reference in a new issue