From 4d15e451c95220f682e262d125ef3fba38ac44ed Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 5 May 2014 13:35:48 +0200 Subject: gnu sed no longer required, will be build as hosttool --- scripts/scan-tools.sh | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) (limited to 'scripts/scan-tools.sh') diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh index 40486e1fe..930e8df0b 100644 --- a/scripts/scan-tools.sh +++ b/scripts/scan-tools.sh @@ -158,20 +158,6 @@ if [[ ! -s /usr/include/ncurses.h ]]; then fi fi -if ! which sed >/dev/null 2>&1; then - echo You must install GNU sed to continue. - echo - out=1 -fi - -if ! sed --version 2>/dev/null|grep GNU >/dev/null;then - if ! which gsed >/dev/null 2>&1; then - echo You must install GNU sed to continue. - echo - out=1 - fi -fi - if ! which wget >/dev/null 2>&1; then echo You must install wget to continue. echo @@ -270,6 +256,16 @@ if ! which gawk >/dev/null 2>&1; then host_build_gawk=1 fi +host_build_sed=0 +if ! which gsed >/dev/null 2>&1; then + if which sed >/dev/null 2>&1; then + if ! sed --version 2>/dev/null|grep GNU >/dev/null;then + echo "No GNU sed found, will build one." + host_build_sed=1 + fi + fi +fi + host_build_xz=0 if ! which xz >/dev/null 2>&1; then echo "No xz found, will build one." @@ -328,6 +324,7 @@ if [ $host_build_mksh -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_MKSH" if [ $host_build_patch -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_PATCH" >> $topdir/target/config/Config.in.prereq ;fi if [ $host_build_pkgconf -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_PKGCONF" >> $topdir/target/config/Config.in.prereq ;fi if [ $host_build_findutils -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_FINDUTILS" >> $topdir/target/config/Config.in.prereq ;fi +if [ $host_build_sed -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_SED" >> $topdir/target/config/Config.in.prereq ;fi if [ $host_build_xz -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_XZ" >> $topdir/target/config/Config.in.prereq ;fi # optional if [ $host_build_ccache -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_CCACHE if ADK_HOST_NEED_CCACHE" >> $topdir/target/config/Config.in.prereq ;fi -- cgit v1.2.3