diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-09-30 19:03:23 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-09-30 19:03:23 +0200 |
| commit | 7f46305c0aa9963be7b87489d52876916c8643e0 (patch) | |
| tree | d54bd4030d9ce79e3bda493f19ac48038b55430d /scripts | |
| parent | 01f827482883432131c465a8e7c2586b18cbb167 (diff) | |
fix tool dependency list add preliminary rpm backend support
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/scan-pkgs.sh | 11 | ||||
| -rw-r--r-- | scripts/scan-tools.sh | 32 |
2 files changed, 11 insertions, 32 deletions
diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index 69f2b1e3a..ad265d457 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -23,6 +23,10 @@ out=0 . $topdir/.config +if [[ -n $ADK_TARGET_PACKAGE_RPM ]]; then + NEED_RPM="$NEED_RPM rpm" +fi + if [[ -n $ADK_PACKAGE_ALSA_UTILS ]]; then NEED_XMLTO="$NEED_XMLTO alsa-utils" fi @@ -111,6 +115,13 @@ if [[ -n $ADK_USE_CCACHE ]]; then fi fi +if [[ -n $NEED_RPM ]]; then + if ! which rpmbuild >/dev/null 2>&1; then + echo >&2 You need rpmbuild to to use $NEED_RPM package backend + out=1 + fi +fi + #if [[ -n $ADK_COMPILE_MYSQL && $OStype != Linux ]]; then # echo >&2 mySQL does not build on non-GNU/Linux. # out=1 diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh index 29cdf0fef..d63391f66 100644 --- a/scripts/scan-tools.sh +++ b/scripts/scan-tools.sh @@ -107,38 +107,6 @@ 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 tar >/dev/null 2>&1; then echo You must install GNU tar to continue. echo |