Commit f506f7c8 authored by Bernhard Reutner-Fischer's avatar Bernhard Reutner-Fischer
Browse files

- fixes for bugs introduced with the MacOS10 support (Heikki Lindholm)

parent 9e59c9bc

package/sed/sed.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

toolchain/dependencies/check-host-sed.sh

+4 −10
Original line number Diff line number Diff line 
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