diff options
| author | Arnout Vandecappelle <arnout@mind.be> | 2014-02-04 16:18:52 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-02-09 17:00:13 +0100 |
| commit | 4113b3c3bdb9c7943e011827982000403f66dc61 (patch) | |
| tree | f4d52eb74841c6f925ca0a200f7cd0fc9fce454c /support/dependencies | |
| parent | a7c1b84a5967e88be8032ef085c2d84aafc0008a (diff) | |
infra: replace BUILDROOT_CONFIG with BR2_CONFIG
To make the naming consistent (all user-visible options should be
prefixed with BR2_).
An entry is added to Makefile.legacy to warn users who have set
BUILDROOT_CONFIG but not BR2_CONFIG.
Still export BUILDROOT_CONFIG but pointing to some phony value, to
make sure that scripts that still use it fail in a predictable way.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Jérémy Rosen <jeremy.rosen@openwide.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'support/dependencies')
| -rwxr-xr-x | support/dependencies/dependencies.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 5739ee03b..0e7e1fa04 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -167,8 +167,8 @@ if test "${missing_progs}" = "yes" ; then exit 1 fi -if grep ^BR2_TOOLCHAIN_BUILDROOT=y $BUILDROOT_CONFIG > /dev/null && \ - grep ^BR2_ENABLE_LOCALE=y $BUILDROOT_CONFIG > /dev/null ; then +if grep ^BR2_TOOLCHAIN_BUILDROOT=y $BR2_CONFIG > /dev/null && \ + grep ^BR2_ENABLE_LOCALE=y $BR2_CONFIG > /dev/null ; then if ! which locale > /dev/null ; then echo echo "You need locale support on your build machine to build a toolchain supporting locales" @@ -181,7 +181,7 @@ if grep ^BR2_TOOLCHAIN_BUILDROOT=y $BUILDROOT_CONFIG > /dev/null && \ fi fi -if grep -q ^BR2_PACKAGE_CLASSPATH=y $BUILDROOT_CONFIG ; then +if grep -q ^BR2_PACKAGE_CLASSPATH=y $BR2_CONFIG ; then for prog in javac jar; do if ! which $prog > /dev/null ; then echo >&2 @@ -191,7 +191,7 @@ if grep -q ^BR2_PACKAGE_CLASSPATH=y $BUILDROOT_CONFIG ; then done fi -if grep -q ^BR2_HOSTARCH_NEEDS_IA32_LIBS=y $BUILDROOT_CONFIG ; then +if grep -q ^BR2_HOSTARCH_NEEDS_IA32_LIBS=y $BR2_CONFIG ; then if test ! -f /lib/ld-linux.so.2 ; then echo echo "Your Buildroot configuration uses pre-built tools for the x86 architecture," @@ -205,7 +205,7 @@ if grep -q ^BR2_HOSTARCH_NEEDS_IA32_LIBS=y $BUILDROOT_CONFIG ; then fi fi -if grep -q ^BR2_HOSTARCH_NEEDS_IA32_COMPILER=y $BUILDROOT_CONFIG ; then +if grep -q ^BR2_HOSTARCH_NEEDS_IA32_COMPILER=y $BR2_CONFIG ; then if ! echo "int main(void) {}" | gcc -m32 -x c - -o /dev/null ; then echo echo "Your Buildroot configuration needs a compiler capable of building 32 bits binaries." |