configure.in: Put {start,end}-sanitize-for-fsf around code that removes some
programs based on host or target; this silent failure to configure isn't appropriate for the separate one-tool releases FSF puts out. .Sanitize: Remove that code if "for-fsf" is on command line; remove just the markers if it isn't.
This commit is contained in:
parent
a8c789c4b8
commit
5357f1287d
26
.Sanitize
26
.Sanitize
|
@ -179,6 +179,32 @@ else
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if ( echo $* | grep for\-fsf > /dev/null ) ; then
|
||||||
|
if [ -n "${verbose}" ]; then
|
||||||
|
echo Cleaning up configure.in for FSF release...
|
||||||
|
fi
|
||||||
|
sed '/start\-sanitize\-for\-fsf/,/end\-sanitize\-for\-fsf/d' < configure.in > new
|
||||||
|
if [ -n "${safe}" -a ! -f .Recover/$i ]; then
|
||||||
|
if [ -n "${verbose}" ]; then
|
||||||
|
echo Caching configure.in in .Recover...
|
||||||
|
fi
|
||||||
|
mv configure.in .Recover
|
||||||
|
fi
|
||||||
|
mv new configure.in
|
||||||
|
else
|
||||||
|
if [ -n "${verbose}" ]; then
|
||||||
|
echo Removing sanitize-for-fsf markers from configure.in...
|
||||||
|
fi
|
||||||
|
grep -v sanitize-for-fsf < configure.in > new
|
||||||
|
if [ -n "${safe}" ]; then
|
||||||
|
if [ -n "${verbose}" ]; then
|
||||||
|
echo Caching configure.in in .Recover...
|
||||||
|
fi
|
||||||
|
mv configure.in .Recover
|
||||||
|
fi
|
||||||
|
mv new configure.in
|
||||||
|
fi
|
||||||
|
|
||||||
for i in * ; do
|
for i in * ; do
|
||||||
if test ! -d $i && (grep sanitize $i > /dev/null) ; then
|
if test ! -d $i && (grep sanitize $i > /dev/null) ; then
|
||||||
echo '***' Some mentions of Sanitize are still left in $i! 1>&2
|
echo '***' Some mentions of Sanitize are still left in $i! 1>&2
|
||||||
|
|
11
configure.in
11
configure.in
|
@ -137,7 +137,7 @@ esac
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# some tools are only suitable for building in a "native" situation.
|
# Some tools are only suitable for building in a "native" situation.
|
||||||
# Those are added when we have a host==target configuration. For cross
|
# Those are added when we have a host==target configuration. For cross
|
||||||
# toolchains, we add some directories that should only be useful in a
|
# toolchains, we add some directories that should only be useful in a
|
||||||
# cross-compiler.
|
# cross-compiler.
|
||||||
|
@ -156,10 +156,13 @@ else
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
## start-sanitize-for-fsf
|
||||||
|
|
||||||
# remove more programs from consideration, based on the host or
|
# Remove more programs from consideration, based on the host or
|
||||||
# target this usually means that a port of the program doesn't
|
# target this usually means that a port of the program doesn't
|
||||||
# exist yet.
|
# exist yet. This section gets removed for FSF releases,
|
||||||
|
# where we want the configure scripts in the subdirectories to
|
||||||
|
# complain if the target or host isn't supported.
|
||||||
|
|
||||||
case "${host}" in
|
case "${host}" in
|
||||||
alpha-dec-osf1)
|
alpha-dec-osf1)
|
||||||
|
@ -230,6 +233,8 @@ case "${target}" in
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
## end-sanitize-for-fsf
|
||||||
|
|
||||||
# Set with_gnu_as and with_gnu_ld as appropriate.
|
# Set with_gnu_as and with_gnu_ld as appropriate.
|
||||||
#
|
#
|
||||||
# This is done by determining whether or not the appropriate directory
|
# This is done by determining whether or not the appropriate directory
|
||||||
|
|
Loading…
Reference in New Issue