diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/scan-tools.sh | 68 | ||||
| -rwxr-xr-x | scripts/tar | 6 |
2 files changed, 42 insertions, 32 deletions
diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh index 00aa92de3..29cdf0fef 100644 --- a/scripts/scan-tools.sh +++ b/scripts/scan-tools.sh @@ -107,37 +107,37 @@ if ! which cpp >/dev/null 2>&1; then out=1 fi -if ! which flex >/dev/null 2>&1; then - echo You must install flex to continue. - echo - out=1 -else - echo '%%' | flex - - if fgrep _POSIX_SOURCE lex.yy.c; then - echo Your lexer \(flex\) contains a broken skeleton. - if [[ $NO_ERROR = 1 ]]; then - echo WARNING: continue at your own risk. - echo Some packages may be broken. - else - echo You can continue the build by issuing \'make prereq-noerror\' - echo However, several packages may faild to build correctly. - out=1 - fi - echo - fi -fi - -if ! which bison >/dev/null 2>&1; then - echo You must install GNU bison to continue. - echo - out=1 -fi - -if ! which gperf >/dev/null 2>&1; then - echo You must install gperf to continue. - echo - out=1 -fi +#if ! which flex >/dev/null 2>&1; then +# echo You must install flex to continue. +# echo +# out=1 +#else +# echo '%%' | flex - +# if fgrep _POSIX_SOURCE lex.yy.c; then +# echo Your lexer \(flex\) contains a broken skeleton. +# if [[ $NO_ERROR = 1 ]]; then +# echo WARNING: continue at your own risk. +# echo Some packages may be broken. +# else +# echo You can continue the build by issuing \'make prereq-noerror\' +# echo However, several packages may faild to build correctly. +# out=1 +# fi +# echo +# fi +#fi + +#if ! which bison >/dev/null 2>&1; then +# echo You must install GNU bison to continue. +# echo +# out=1 +#fi + +#if ! which gperf >/dev/null 2>&1; then +# echo You must install gperf to continue. +# echo +# out=1 +#fi if ! which tar >/dev/null 2>&1; then echo You must install GNU tar to continue. @@ -277,6 +277,12 @@ if ! which file >/dev/null 2>&1; then out=1 fi +if ! which perl >/dev/null 2>&1; then + echo You must install perl to continue. + echo + out=1 +fi + cd $topdir rm -rf tmp diff --git a/scripts/tar b/scripts/tar index 60c5057da..5d6db28b4 100755 --- a/scripts/tar +++ b/scripts/tar @@ -3,7 +3,11 @@ # material, please see the LICENCE file in the top-level directory. if [ -z "$(which gtar 2>/dev/null)" ];then - /bin/tar "$@" + if [ -x /usr/bin/tar ];then + /usr/bin/tar "$@" + else + /bin/tar "$@" + fi else gtar "$@" fi |