diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2007-03-10 10:29:08 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2007-03-10 10:29:08 +0000 |
| commit | f506f7c89356c16aa8a1968135aee55d5f41a3c5 (patch) | |
| tree | 9d604bdd2282ce9e5df485eb00d325d2725f95ea | |
| parent | 9e59c9bc006734237510e8bbb36e83ed429cd03f (diff) | |
- fixes for bugs introduced with the MacOS10 support (Heikki Lindholm)
| -rw-r--r-- | package/sed/sed.mk | 2 | ||||
| -rwxr-xr-x | toolchain/dependencies/check-host-sed.sh | 14 |
2 files changed, 5 insertions, 11 deletions
diff --git a/package/sed/sed.mk b/package/sed/sed.mk index 978abe7be..640e7dd42 100644 --- a/package/sed/sed.mk +++ b/package/sed/sed.mk @@ -42,7 +42,7 @@ $(SED_DIR1)/.unpacked: $(DL_DIR)/$(SED_SOURCE) $(SED_DIR1)/.configured: $(SED_DIR1)/.unpacked (cd $(SED_DIR1); rm -rf config.cache; \ ./configure \ - --prefix=$(HOST_SED_DIR) \ + --prefix=/usr \ ); touch $(SED_DIR1)/.configured diff --git a/toolchain/dependencies/check-host-sed.sh b/toolchain/dependencies/check-host-sed.sh index ba99a4258..55104debd 100755 --- a/toolchain/dependencies/check-host-sed.sh +++ b/toolchain/dependencies/check-host-sed.sh @@ -1,11 +1,5 @@ SEDLIST="/usr/bin/sed /bin/sed sed gnused gsed" -DIFF=$(which diff) -if ! test -x "$DIFF" ; then - /bin/echo -e "\n\ntesting for sed needs 'diff' on your build machine\n"; - exit 1; -fi; - for SED in $SEDLIST do if ! test -x $SED ; then @@ -17,20 +11,20 @@ do fi echo "HELLO" > .sedtest - echo "GOODBYE" > .sedtest-correct $SED -i -e "s/HELLO/GOODBYE/" .sedtest >/dev/null 2>&1 + RESULT=$(cat .sedtest) if test $? != 0 ; then SED="" elif test -e ".sedtest-e" ; then rm -f ".sedtest-e" SED="" - elif ! $DIFF ".sedtest" ".sedtest-correct" > /dev/null ; then - echo "diff failed" + elif [ -z "${RESULT}" ] || [ "${RESULT}" != "GOODBYE"] > /dev/null ; + then SED="" fi - rm -f .sedtest .sedtest-correct + rm -f .sedtest if [ ! -z "$SED" ] ; then break fi |