From 6b8b829508a98667267b6a5ec8342ddd1f2b3377 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 22 May 2010 00:52:22 +0200 Subject: dependencies: fix tests on LD_LIBRARY_PATH Things like LD_LIBRARY_PATH=. or even LD_LIBRARY_PATH=.:/usr/lib were not detected as incorrect. Signed-off-by: Thomas Petazzoni --- toolchain/dependencies/dependencies.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/toolchain/dependencies/dependencies.sh b/toolchain/dependencies/dependencies.sh index 923c76bcd..f5d9163cc 100755 --- a/toolchain/dependencies/dependencies.sh +++ b/toolchain/dependencies/dependencies.sh @@ -23,10 +23,10 @@ fi # sanity check for CWD in LD_LIBRARY_PATH # try not to rely on egrep.. if test -n "$LD_LIBRARY_PATH" ; then - /bin/echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | /bin/grep ':.:' >/dev/null 2>&1 || - /bin/echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | /bin/grep 'TRiGGER_start:' >/dev/null 2>&1 || - /bin/echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | /bin/grep ':TRiGGER_end' >/dev/null 2>&1 || - /bin/echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | /bin/grep '::' >/dev/null 2>&1 + /bin/echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | /bin/grep ':\.:' >/dev/null 2>&1 || + /bin/echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | /bin/grep 'TRiGGER_start\.:' >/dev/null 2>&1 || + /bin/echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | /bin/grep ':\.TRiGGER_end' >/dev/null 2>&1 || + /bin/echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | /bin/grep 'TRiGGER_start\.TRiGGER_end' >/dev/null 2>&1 if test $? = 0; then /bin/echo -e "\nYou seem to have the current working directory in your" /bin/echo -e "LD_LIBRARY_PATH environment variable. This doesn't work.\n" -- cgit v1.2.3 From c87eb21e00ac4d5e2106565f8ea70473895289ae Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 22 May 2010 00:53:08 +0200 Subject: dependencies: check that . is not in the PATH Having . in the PATH makes the toolchain build process fail because it confuses host tools and target tools. This fixes bug #75. Signed-off-by: Thomas Petazzoni --- toolchain/dependencies/dependencies.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/toolchain/dependencies/dependencies.sh b/toolchain/dependencies/dependencies.sh index f5d9163cc..34149c1a3 100755 --- a/toolchain/dependencies/dependencies.sh +++ b/toolchain/dependencies/dependencies.sh @@ -34,6 +34,21 @@ if test -n "$LD_LIBRARY_PATH" ; then fi fi; +# sanity check for CWD in PATH. Having the current working directory +# in the PATH makes the toolchain build process break. +# try not to rely on egrep.. +if test -n "$PATH" ; then + /bin/echo TRiGGER_start"$PATH"TRiGGER_end | /bin/grep ':\.:' >/dev/null 2>&1 || + /bin/echo TRiGGER_start"$PATH"TRiGGER_end | /bin/grep 'TRiGGER_start\.:' >/dev/null 2>&1 || + /bin/echo TRiGGER_start"$PATH"TRiGGER_end | /bin/grep ':\.TRiGGER_end' >/dev/null 2>&1 || + /bin/echo TRiGGER_start"$PATH"TRiGGER_end | /bin/grep 'TRIGGER_start\.TRIGGER_end' >/dev/null 2>&1 + if test $? = 0; then + /bin/echo -e "\nYou seem to have the current working directory in your" + /bin/echo -e "PATH environment variable. This doesn't work.\n" + exit 1; + fi +fi; + # Verify that which is installed if ! which which > /dev/null ; then /bin/echo -e "\nYou must install 'which' on your build machine\n"; -- cgit v1.2.3