From a792668b58fd5f551f30d40c2352f16011f1f92f Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Wed, 8 Feb 2012 17:22:16 +0100 Subject: dependencies: move from toolchain/ to support/ As suggested by Arnout Vandecappelle, move toolchain/dependencies to support/dependencies, as it really is not toolchain-specific anymore. Signed-off-by: Thomas De Schampheleire Acked-by: Thomas Petazzoni Acked-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- Makefile | 2 + support/dependencies/dependencies.mk | 35 ++++++++ support/dependencies/dependencies.sh | 160 +++++++++++++++++++++++++++++++++ toolchain/dependencies/dependencies.mk | 35 -------- toolchain/dependencies/dependencies.sh | 160 --------------------------------- toolchain/toolchain-buildroot.mk | 1 - toolchain/toolchain-crosstool-ng.mk | 1 - toolchain/toolchain-external.mk | 1 - 8 files changed, 197 insertions(+), 198 deletions(-) create mode 100644 support/dependencies/dependencies.mk create mode 100755 support/dependencies/dependencies.sh delete mode 100644 toolchain/dependencies/dependencies.mk delete mode 100755 toolchain/dependencies/dependencies.sh diff --git a/Makefile b/Makefile index e1621f965..90d1a9d50 100644 --- a/Makefile +++ b/Makefile @@ -297,6 +297,8 @@ include package/Makefile.in all: world +include support/dependencies/dependencies.mk + # We also need the various per-package makefiles, which also add # each selected package to TARGETS if that package was selected # in the .config file. diff --git a/support/dependencies/dependencies.mk b/support/dependencies/dependencies.mk new file mode 100644 index 000000000..3e621e9dd --- /dev/null +++ b/support/dependencies/dependencies.mk @@ -0,0 +1,35 @@ +###################################################################### +# +# Check buildroot dependencies and bail out if the user's +# system is judged to be lacking.... +# +###################################################################### + +DEPENDENCIES_HOST_PREREQ:= +ifeq ($(BR2_STRIP_sstrip),y) +DEPENDENCIES_HOST_PREREQ+=host-sstrip +endif + +core-dependencies: + @HOSTCC="$(firstword $(HOSTCC))" MAKE="$(MAKE)" \ + CONFIG_FILE="$(CONFIG_DIR)/.config" \ + DL_TOOLS="$(sort $(DL_TOOLS_DEPENDENCIES))" \ + $(TOPDIR)/support/dependencies/dependencies.sh + +dependencies: core-dependencies $(DEPENDENCIES_HOST_PREREQ) + +dependencies-source: + +dependencies-clean: + rm -f $(SSTRIP_TARGET) + +dependencies-dirclean: + true + +############################################################# +# +# Toplevel Makefile options +# +############################################################# +.PHONY: dependencies core-dependencies + diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh new file mode 100755 index 000000000..c47ffcf43 --- /dev/null +++ b/support/dependencies/dependencies.sh @@ -0,0 +1,160 @@ +#!/bin/sh +# vi: set sw=4 ts=4: +#set -x + +export LC_ALL=C + +# Verify that grep works +echo "WORKS" | grep "WORKS" >/dev/null 2>&1 +if test $? != 0 ; then + /bin/echo -e "\ngrep doesn't work\n" + exit 1 +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 '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" + exit 1; + 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; + +if test -n "$PERL_MM_OPT" ; then + /bin/echo -e "\nYou have PERL_MM_OPT defined because Perl local::lib" + /bin/echo -e "is installed on your system. Please unset this variable" + /bin/echo -e "before starting Buildroot, otherwise the compilation of" + /bin/echo -e "Perl related packages will fail" + 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"; + exit 1; +fi; + +if ! which sed > /dev/null ; then + /bin/echo -e "\nYou must install 'sed' on your build machine\n" + exit 1 +fi + +# Check make +MAKE=$(which make 2> /dev/null) +if [ -z "$MAKE" ] ; then + /bin/echo -e "\nYou must install 'make' on your build machine\n"; + exit 1; +fi; +MAKE_VERSION=$($MAKE --version 2>&1 | sed -e 's/^.* \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q') +if [ -z "$MAKE_VERSION" ] ; then + /bin/echo -e "\nYou must install 'make' on your build machine\n"; + exit 1; +fi; +MAKE_MAJOR=$(echo $MAKE_VERSION | sed -e "s/\..*//g") +MAKE_MINOR=$(echo $MAKE_VERSION | sed -e "s/^$MAKE_MAJOR\.//g" -e "s/\..*//g" -e "s/[a-zA-Z].*//g") +if [ $MAKE_MAJOR -lt 3 ] || [ $MAKE_MAJOR -eq 3 -a $MAKE_MINOR -lt 81 ] ; then + /bin/echo -e "\nYou have make '$MAKE_VERSION' installed. GNU make >=3.81 is required\n" + exit 1; +fi; + +# Check host gcc +COMPILER=$(which $HOSTCC_NOCCACHE 2> /dev/null) +if [ -z "$COMPILER" ] ; then + COMPILER=$(which cc 2> /dev/null) +fi; +if [ -z "$COMPILER" ] ; then + /bin/echo -e "\nYou must install 'gcc' on your build machine\n"; + exit 1; +fi; + +COMPILER_VERSION=$($COMPILER -v 2>&1 | sed -n '/^gcc version/p' | + sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q') +if [ -z "$COMPILER_VERSION" ] ; then + /bin/echo -e "\nYou must install 'gcc' on your build machine\n"; + exit 1; +fi; +COMPILER_MAJOR=$(echo $COMPILER_VERSION | sed -e "s/\..*//g") +COMPILER_MINOR=$(echo $COMPILER_VERSION | sed -e "s/^$COMPILER_MAJOR\.//g" -e "s/\..*//g") +if [ $COMPILER_MAJOR -lt 3 -o $COMPILER_MAJOR -eq 2 -a $COMPILER_MINOR -lt 95 ] ; then + echo "\nYou have gcc '$COMPILER_VERSION' installed. gcc >= 2.95 is required\n" + exit 1; +fi; + +# check for host CXX +CXXCOMPILER=$(which $HOSTCXX_NOCCACHE 2> /dev/null) +if [ -z "$CXXCOMPILER" ] ; then + CXXCOMPILER=$(which c++ 2> /dev/null) +fi +if [ -z "$CXXCOMPILER" ] ; then + /bin/echo -e "\nYou may have to install 'g++' on your build machine\n" + #exit 1 +fi +if [ ! -z "$CXXCOMPILER" ] ; then + CXXCOMPILER_VERSION=$($CXXCOMPILER -v 2>&1 | sed -n '/^gcc version/p' | + sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q') + if [ -z "$CXXCOMPILER_VERSION" ] ; then + /bin/echo -e "\nYou may have to install 'g++' on your build machine\n" + fi + + CXXCOMPILER_MAJOR=$(echo $CXXCOMPILER_VERSION | sed -e "s/\..*//g") + CXXCOMPILER_MINOR=$(echo $CXXCOMPILER_VERSION | sed -e "s/^$CXXCOMPILER_MAJOR\.//g" -e "s/\..*//g") + if [ $CXXCOMPILER_MAJOR -lt 3 -o $CXXCOMPILER_MAJOR -eq 2 -a $CXXCOMPILER_MINOR -lt 95 ] ; then + /bin/echo -e "\nYou have g++ '$CXXCOMPILER_VERSION' installed. g++ >= 2.95 is required\n" + exit 1 + fi +fi + +# Check bash +if ! $SHELL --version 2>&1 | grep -q '^GNU bash'; then + /bin/echo -e "\nYou must install 'bash' on your build machine\n"; + exit 1; +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 unzip rsync ${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 + /bin/echo -e "makeinfo is usually part of the texinfo package in your distribution\n" + elif test $prog = "msgfmt" ; then + /bin/echo -e "msgfmt is usually part of the gettext package in your distribution\n" + elif test $prog = "svn" ; then + /bin/echo -e "svn is usually part of the subversion package in your distribution\n" + else + /bin/echo -e "\n" + fi + exit 1; + fi +done + +if grep ^BR2_TOOLCHAIN_BUILDROOT=y $CONFIG_FILE > /dev/null && \ + grep ^BR2_ENABLE_LOCALE=y $CONFIG_FILE > /dev/null ; then + if ! which locale > /dev/null ; then + /bin/echo -e "\nYou need locale support on your build machine to build a toolchain supporting locales\n" + exit 1 ; + fi + if ! locale -a | grep -i utf8$ ; then + /bin/echo -e "\nYou need at least one UTF8 locale to build a toolchain supporting locales\n" + exit 1 ; + fi +fi diff --git a/toolchain/dependencies/dependencies.mk b/toolchain/dependencies/dependencies.mk deleted file mode 100644 index ea8bf252b..000000000 --- a/toolchain/dependencies/dependencies.mk +++ /dev/null @@ -1,35 +0,0 @@ -###################################################################### -# -# Check buildroot dependencies and bail out if the user's -# system is judged to be lacking.... -# -###################################################################### - -DEPENDENCIES_HOST_PREREQ:= -ifeq ($(BR2_STRIP_sstrip),y) -DEPENDENCIES_HOST_PREREQ+=host-sstrip -endif - -core-dependencies: - @HOSTCC="$(firstword $(HOSTCC))" MAKE="$(MAKE)" \ - CONFIG_FILE="$(CONFIG_DIR)/.config" \ - DL_TOOLS="$(sort $(DL_TOOLS_DEPENDENCIES))" \ - $(TOPDIR)/toolchain/dependencies/dependencies.sh - -dependencies: core-dependencies $(DEPENDENCIES_HOST_PREREQ) - -dependencies-source: - -dependencies-clean: - rm -f $(SSTRIP_TARGET) - -dependencies-dirclean: - true - -############################################################# -# -# Toplevel Makefile options -# -############################################################# -.PHONY: dependencies core-dependencies - diff --git a/toolchain/dependencies/dependencies.sh b/toolchain/dependencies/dependencies.sh deleted file mode 100755 index c47ffcf43..000000000 --- a/toolchain/dependencies/dependencies.sh +++ /dev/null @@ -1,160 +0,0 @@ -#!/bin/sh -# vi: set sw=4 ts=4: -#set -x - -export LC_ALL=C - -# Verify that grep works -echo "WORKS" | grep "WORKS" >/dev/null 2>&1 -if test $? != 0 ; then - /bin/echo -e "\ngrep doesn't work\n" - exit 1 -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 '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" - exit 1; - 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; - -if test -n "$PERL_MM_OPT" ; then - /bin/echo -e "\nYou have PERL_MM_OPT defined because Perl local::lib" - /bin/echo -e "is installed on your system. Please unset this variable" - /bin/echo -e "before starting Buildroot, otherwise the compilation of" - /bin/echo -e "Perl related packages will fail" - 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"; - exit 1; -fi; - -if ! which sed > /dev/null ; then - /bin/echo -e "\nYou must install 'sed' on your build machine\n" - exit 1 -fi - -# Check make -MAKE=$(which make 2> /dev/null) -if [ -z "$MAKE" ] ; then - /bin/echo -e "\nYou must install 'make' on your build machine\n"; - exit 1; -fi; -MAKE_VERSION=$($MAKE --version 2>&1 | sed -e 's/^.* \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q') -if [ -z "$MAKE_VERSION" ] ; then - /bin/echo -e "\nYou must install 'make' on your build machine\n"; - exit 1; -fi; -MAKE_MAJOR=$(echo $MAKE_VERSION | sed -e "s/\..*//g") -MAKE_MINOR=$(echo $MAKE_VERSION | sed -e "s/^$MAKE_MAJOR\.//g" -e "s/\..*//g" -e "s/[a-zA-Z].*//g") -if [ $MAKE_MAJOR -lt 3 ] || [ $MAKE_MAJOR -eq 3 -a $MAKE_MINOR -lt 81 ] ; then - /bin/echo -e "\nYou have make '$MAKE_VERSION' installed. GNU make >=3.81 is required\n" - exit 1; -fi; - -# Check host gcc -COMPILER=$(which $HOSTCC_NOCCACHE 2> /dev/null) -if [ -z "$COMPILER" ] ; then - COMPILER=$(which cc 2> /dev/null) -fi; -if [ -z "$COMPILER" ] ; then - /bin/echo -e "\nYou must install 'gcc' on your build machine\n"; - exit 1; -fi; - -COMPILER_VERSION=$($COMPILER -v 2>&1 | sed -n '/^gcc version/p' | - sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q') -if [ -z "$COMPILER_VERSION" ] ; then - /bin/echo -e "\nYou must install 'gcc' on your build machine\n"; - exit 1; -fi; -COMPILER_MAJOR=$(echo $COMPILER_VERSION | sed -e "s/\..*//g") -COMPILER_MINOR=$(echo $COMPILER_VERSION | sed -e "s/^$COMPILER_MAJOR\.//g" -e "s/\..*//g") -if [ $COMPILER_MAJOR -lt 3 -o $COMPILER_MAJOR -eq 2 -a $COMPILER_MINOR -lt 95 ] ; then - echo "\nYou have gcc '$COMPILER_VERSION' installed. gcc >= 2.95 is required\n" - exit 1; -fi; - -# check for host CXX -CXXCOMPILER=$(which $HOSTCXX_NOCCACHE 2> /dev/null) -if [ -z "$CXXCOMPILER" ] ; then - CXXCOMPILER=$(which c++ 2> /dev/null) -fi -if [ -z "$CXXCOMPILER" ] ; then - /bin/echo -e "\nYou may have to install 'g++' on your build machine\n" - #exit 1 -fi -if [ ! -z "$CXXCOMPILER" ] ; then - CXXCOMPILER_VERSION=$($CXXCOMPILER -v 2>&1 | sed -n '/^gcc version/p' | - sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q') - if [ -z "$CXXCOMPILER_VERSION" ] ; then - /bin/echo -e "\nYou may have to install 'g++' on your build machine\n" - fi - - CXXCOMPILER_MAJOR=$(echo $CXXCOMPILER_VERSION | sed -e "s/\..*//g") - CXXCOMPILER_MINOR=$(echo $CXXCOMPILER_VERSION | sed -e "s/^$CXXCOMPILER_MAJOR\.//g" -e "s/\..*//g") - if [ $CXXCOMPILER_MAJOR -lt 3 -o $CXXCOMPILER_MAJOR -eq 2 -a $CXXCOMPILER_MINOR -lt 95 ] ; then - /bin/echo -e "\nYou have g++ '$CXXCOMPILER_VERSION' installed. g++ >= 2.95 is required\n" - exit 1 - fi -fi - -# Check bash -if ! $SHELL --version 2>&1 | grep -q '^GNU bash'; then - /bin/echo -e "\nYou must install 'bash' on your build machine\n"; - exit 1; -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 unzip rsync ${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 - /bin/echo -e "makeinfo is usually part of the texinfo package in your distribution\n" - elif test $prog = "msgfmt" ; then - /bin/echo -e "msgfmt is usually part of the gettext package in your distribution\n" - elif test $prog = "svn" ; then - /bin/echo -e "svn is usually part of the subversion package in your distribution\n" - else - /bin/echo -e "\n" - fi - exit 1; - fi -done - -if grep ^BR2_TOOLCHAIN_BUILDROOT=y $CONFIG_FILE > /dev/null && \ - grep ^BR2_ENABLE_LOCALE=y $CONFIG_FILE > /dev/null ; then - if ! which locale > /dev/null ; then - /bin/echo -e "\nYou need locale support on your build machine to build a toolchain supporting locales\n" - exit 1 ; - fi - if ! locale -a | grep -i utf8$ ; then - /bin/echo -e "\nYou need at least one UTF8 locale to build a toolchain supporting locales\n" - exit 1 ; - fi -fi diff --git a/toolchain/toolchain-buildroot.mk b/toolchain/toolchain-buildroot.mk index c61156276..f21cefdb1 100644 --- a/toolchain/toolchain-buildroot.mk +++ b/toolchain/toolchain-buildroot.mk @@ -1,6 +1,5 @@ # Include files required for the internal toolchain backend -include toolchain/dependencies/dependencies.mk include toolchain/elf2flt/elf2flt.mk include toolchain/gcc/gcc-uclibc-4.x.mk include toolchain/gdb/gdb.mk diff --git a/toolchain/toolchain-crosstool-ng.mk b/toolchain/toolchain-crosstool-ng.mk index e480da981..f6cc2b917 100644 --- a/toolchain/toolchain-crosstool-ng.mk +++ b/toolchain/toolchain-crosstool-ng.mk @@ -2,7 +2,6 @@ # Explicit ordering: include toolchain/helpers.mk -include toolchain/dependencies/dependencies.mk include toolchain/elf2flt/elf2flt.mk include toolchain/gcc/gcc-uclibc-4.x.mk include toolchain/gdb/gdb.mk diff --git a/toolchain/toolchain-external.mk b/toolchain/toolchain-external.mk index d67405b00..d5b2aacbd 100644 --- a/toolchain/toolchain-external.mk +++ b/toolchain/toolchain-external.mk @@ -1,7 +1,6 @@ # Required includes for the external toolchain backend include toolchain/helpers.mk -include toolchain/dependencies/dependencies.mk include toolchain/elf2flt/elf2flt.mk include toolchain/gcc/gcc-uclibc-4.x.mk include toolchain/gdb/gdb.mk -- cgit v1.2.3