From 1506b0cfd5708c81fe286549d63843c5030c0e8a Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Fri, 9 Mar 2007 08:33:34 +0000 Subject: Improve the checking of sed by adding some common GNU sed installation names (gsed/gnused), checking for a basic OS X sed feature in command line option handling, checking the actual result of the sed run against the expected result, and placing common code for the check under toolchain/dependencies/. (Heikki Lindholm) --- package/sed/sedcheck.sh | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'package/sed') diff --git a/package/sed/sedcheck.sh b/package/sed/sedcheck.sh index 535ad6023..3fe44e85e 100755 --- a/package/sed/sedcheck.sh +++ b/package/sed/sedcheck.sh @@ -2,24 +2,10 @@ # Make sure the host sed supports '-i' (in-place). # If it doesn't, we'll build and use our own. +SED=$(toolchain/dependencies/check-host-sed.sh) -if test -x /usr/bin/sed ; then - SED="/usr/bin/sed" -else - if test -x /bin/sed ; then - SED="/bin/sed" - else - SED="sed" - fi -fi - -echo "HELLO" > .sedtest -$SED -i -e "s/HELLO/GOODBYE/" .sedtest >/dev/null 2>&1 - -if test $? != 0 ; then +if [ -z "$SED" ] ; then echo build-sed-host-binary else echo use-sed-host-binary fi - -rm -f .sedtest -- cgit v1.2.3