* [Buildroot] [pull request] Pull request for branch dependencies-fixes
@ 2010-05-21 22:57 Thomas Petazzoni
2010-05-21 22:57 ` [Buildroot] [PATCH 1/2] dependencies: fix tests on LD_LIBRARY_PATH Thomas Petazzoni
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Thomas Petazzoni @ 2010-05-21 22:57 UTC (permalink / raw)
To: buildroot
The following changes since commit 51861e1ba19a036625643a56382a175e8388529f:
Peter Korsgaard (1):
sshfs: needs largefile support (because of fuse)
are available in the git repository at:
git://git.busybox.net/~tpetazzoni/git/buildroot dependencies-fixes
Thomas Petazzoni (2):
dependencies: fix tests on LD_LIBRARY_PATH
dependencies: check that . is not in the PATH
toolchain/dependencies/dependencies.sh | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
Thanks,
--
Thomas Petazzoni
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/2] dependencies: fix tests on LD_LIBRARY_PATH
2010-05-21 22:57 [Buildroot] [pull request] Pull request for branch dependencies-fixes Thomas Petazzoni
@ 2010-05-21 22:57 ` Thomas Petazzoni
2010-05-21 22:57 ` [Buildroot] [PATCH 2/2] dependencies: check that . is not in the PATH Thomas Petazzoni
2010-05-26 22:48 ` [Buildroot] [pull request] Pull request for branch dependencies-fixes Peter Korsgaard
2 siblings, 0 replies; 4+ messages in thread
From: Thomas Petazzoni @ 2010-05-21 22:57 UTC (permalink / raw)
To: buildroot
Things like LD_LIBRARY_PATH=. or even LD_LIBRARY_PATH=.:/usr/lib were
not detected as incorrect.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
toolchain/dependencies/dependencies.sh | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/toolchain/dependencies/dependencies.sh b/toolchain/dependencies/dependencies.sh
index 923c76b..f5d9163 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"
--
1.6.3.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 2/2] dependencies: check that . is not in the PATH
2010-05-21 22:57 [Buildroot] [pull request] Pull request for branch dependencies-fixes Thomas Petazzoni
2010-05-21 22:57 ` [Buildroot] [PATCH 1/2] dependencies: fix tests on LD_LIBRARY_PATH Thomas Petazzoni
@ 2010-05-21 22:57 ` Thomas Petazzoni
2010-05-26 22:48 ` [Buildroot] [pull request] Pull request for branch dependencies-fixes Peter Korsgaard
2 siblings, 0 replies; 4+ messages in thread
From: Thomas Petazzoni @ 2010-05-21 22:57 UTC (permalink / raw)
To: buildroot
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 <thomas.petazzoni@free-electrons.com>
---
toolchain/dependencies/dependencies.sh | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/toolchain/dependencies/dependencies.sh b/toolchain/dependencies/dependencies.sh
index f5d9163..34149c1 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";
--
1.6.3.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [pull request] Pull request for branch dependencies-fixes
2010-05-21 22:57 [Buildroot] [pull request] Pull request for branch dependencies-fixes Thomas Petazzoni
2010-05-21 22:57 ` [Buildroot] [PATCH 1/2] dependencies: fix tests on LD_LIBRARY_PATH Thomas Petazzoni
2010-05-21 22:57 ` [Buildroot] [PATCH 2/2] dependencies: check that . is not in the PATH Thomas Petazzoni
@ 2010-05-26 22:48 ` Peter Korsgaard
2 siblings, 0 replies; 4+ messages in thread
From: Peter Korsgaard @ 2010-05-26 22:48 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> The following changes since commit 51861e1ba19a036625643a56382a175e8388529f:
Thomas> Peter Korsgaard (1):
Thomas> sshfs: needs largefile support (because of fuse)
Thomas> are available in the git repository at:
Thomas> git://git.busybox.net/~tpetazzoni/git/buildroot dependencies-fixes
Pulled, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-05-26 22:48 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-05-21 22:57 [Buildroot] [pull request] Pull request for branch dependencies-fixes Thomas Petazzoni
2010-05-21 22:57 ` [Buildroot] [PATCH 1/2] dependencies: fix tests on LD_LIBRARY_PATH Thomas Petazzoni
2010-05-21 22:57 ` [Buildroot] [PATCH 2/2] dependencies: check that . is not in the PATH Thomas Petazzoni
2010-05-26 22:48 ` [Buildroot] [pull request] Pull request for branch dependencies-fixes Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.