[Buildroot] [PATCH 1/2] Revert "dependencies: ensure that DESTDIR isn't set when running Buildroot"

[Buildroot] [PATCH 1/2] Revert "dependencies: ensure that DESTDIR isn't set when running Buildroot"

[Thomas Petazzoni]

We should instead simply unset it at runtime, like we do for
PKG_CONFIG_PATH.

This reverts commit 9910eba33adb2b783b0df5d90a857816e82fbd55.
---
 support/dependencies/dependencies.sh |    6 ------
 1 file changed, 6 deletions(-)

diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh
index 43ec3cc..c47ffcf 100755
--- a/support/dependencies/dependencies.sh
+++ b/support/dependencies/dependencies.sh
@@ -48,12 +48,6 @@ if test -n "$PERL_MM_OPT" ; then
     exit 1
 fi
 
-if test -n "$DESTDIR" ; then
-    /bin/echo -e "\nYou have the DESTDIR environment variable set. Please"
-    /bin/echo -e "unset it so that Buildroot can work properly."
-    exit 1
-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.7.9.5

[Buildroot] [PATCH 2/2] Ensure DESTDIR will not confuse the build

[Thomas Petazzoni]

Having DESTDIR defined will confuse the build of certain packages, so
we ensure that it is undefined from the environment when Buildroot
starts.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 Makefile |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Makefile b/Makefile
index bcbe9fc..b80477f 100644
--- a/Makefile
+++ b/Makefile
@@ -168,6 +168,10 @@ export HOSTCC_NOCCACHE HOSTCXX_NOCCACHE
 # Make sure pkg-config doesn't look outside the buildroot tree
 unexport PKG_CONFIG_PATH
 
+# Having DESTDIR set in the environment confuses the installation
+# steps of some packages.
+unexport DESTDIR
+
 # bash prints the name of the directory on 'cd <dir>' if CDPATH is
 # set, so unset it here to not cause problems. Notice that the export
 # line doesn't affect the environment of $(shell ..) calls, so
-- 
1.7.9.5

[Buildroot] [PATCH 1/2] Revert "dependencies: ensure that DESTDIR isn't set when running Buildroot"

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 Thomas> We should instead simply unset it at runtime, like we do for
 Thomas> PKG_CONFIG_PATH.

Committed both, thanks.

-- 
Bye, Peter Korsgaard