From f506f7c89356c16aa8a1968135aee55d5f41a3c5 Mon Sep 17 00:00:00 2001
From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Date: Sat, 10 Mar 2007 10:29:08 +0000
Subject: [PATCH] - fixes for bugs introduced with the MacOS10 support (Heikki
 Lindholm)

---
 package/sed/sed.mk                       |  2 +-
 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 978abe7be9..640e7dd42b 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 ba99a42588..55104debdc 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
-- 
2.30.2