aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Larson <kergoth@openedhand.com>2006-08-28 10:43:04 +0000
committerChris Larson <kergoth@openedhand.com>2006-08-28 10:43:04 +0000
commit72d29794cc9fdcf724481d4fe7f78b22748e9cf4 (patch)
treebb63700632efaff4377d64d079ab6d04fa3d8604
parentc813d14c9ffb9c0672a28d68faf85bf3575e9a2f (diff)
downloadopenembedded-core-72d29794cc9fdcf724481d4fe7f78b22748e9cf4.tar.gz
openembedded-core-72d29794cc9fdcf724481d4fe7f78b22748e9cf4.tar.bz2
openembedded-core-72d29794cc9fdcf724481d4fe7f78b22748e9cf4.zip
poky-init-build-env: add $HOME/.oe to BBPATH, for setting a per user conf/site.conf for settings common to all build dirs. unset TERMINFO to avoid glibc pulling in the user's terminal information files.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@667 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rwxr-xr-xpoky-init-build-env13
1 files changed, 10 insertions, 3 deletions
diff --git a/poky-init-build-env b/poky-init-build-env
index b9be03fb3c..b8e377d6bc 100755
--- a/poky-init-build-env
+++ b/poky-init-build-env
@@ -30,6 +30,7 @@ fi
#
OEROOT=`pwd`
+SITEDIR=$HOME/.oe/
BBDIR=$OEROOT/bitbake/
PKGDIR=$OEROOT/meta/
BUILDDIR=$OEROOT/build/
@@ -40,6 +41,7 @@ PATH=$BBDIR/bin/:$PATH
cd $BUILDDIR
# Remove any symlinks from paths
+SITEDIR=`readlink -f $SITEDIR`
BBDIR=`readlink -f $BBDIR`
PKGDIR=`readlink -f $PKGDIR`
BUILDDIR=`readlink -f $BUILDDIR`
@@ -53,14 +55,19 @@ BBPATH=$BBDIR
if test x"$BBDIR" != x"$PKGDIR"; then
BBPATH=$PKGDIR:$BBPATH
fi
+if test x"$SITEDIR" != x"$SITEDIR" && test -d $SITEDIR; then
+ BBPATH=$SITEDIR:$BBPATH
+fi
if test x"$PKGDIR" != x"$BUILDDIR"; then
BBPATH=$BUILDDIR:$BBPATH
fi
export BBPATH
-
-# Blank this so we don't link non-arm libraries
-LD_LIBRARY_PATH=
+# Kill off the TERMINFO variable, as glibc will grab its contents in its 'make
+# install' if set
+unset TERMINFO
+# kill this so we don't link non-arm libraries
+unset LD_LIBRARY_PATH
# Don't export TARGET_ARCH - it *will* cause build failures
export PATH LD_LIBRARY_PATH OEROOT
# Stop multi byte characters breaking the patcher stuff - This is for Redhat / Fedora people really