mirror of
https://github.com/godotengine/buildroot.git
synced 2026-01-04 06:10:16 +03:00
Merge branch 'for-2011.02/dl-tools' of git://git.busybox.net/~tpetazzoni/git/buildroot
This commit is contained in:
@@ -10,9 +10,16 @@ ifeq ($(BR2_STRIP_sstrip),y)
|
||||
DEPENDENCIES_HOST_PREREQ+=sstrip_host
|
||||
endif
|
||||
|
||||
# Remove duplicate entries from $(DL_TOOLS_DEPENDENCIES)
|
||||
DL_TOOLS = \
|
||||
$(findstring svn,$(DL_TOOLS_DEPENDENCIES)) \
|
||||
$(findstring git,$(DL_TOOLS_DEPENDENCIES)) \
|
||||
$(findstring bzr,$(DL_TOOLS_DEPENDENCIES))
|
||||
|
||||
dependencies: $(DEPENDENCIES_HOST_PREREQ)
|
||||
@HOSTCC="$(firstword $(HOSTCC))" MAKE="$(MAKE)" \
|
||||
CONFIG_FILE="$(CONFIG_DIR)/.config" \
|
||||
DL_TOOLS="$(DL_TOOLS)" \
|
||||
$(TOPDIR)/toolchain/dependencies/dependencies.sh
|
||||
|
||||
dependencies-source:
|
||||
|
||||
@@ -132,7 +132,7 @@ if ! $SHELL --version 2>&1 | grep -q '^GNU bash'; then
|
||||
fi;
|
||||
|
||||
# Check that a few mandatory programs are installed
|
||||
for prog in awk bison flex msgfmt makeinfo patch gzip bzip2 perl tar wget cpio python svn unzip ; do
|
||||
for prog in awk bison flex msgfmt makeinfo patch gzip bzip2 perl tar wget cpio python unzip ${DL_TOOLS} ; do
|
||||
if ! which $prog > /dev/null ; then
|
||||
/bin/echo -e "\nYou must install '$prog' on your build machine";
|
||||
if test $prog = "makeinfo" ; then
|
||||
|
||||
Reference in New Issue
Block a user