diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/scan-pkgs.sh | 52 | ||||
| -rw-r--r-- | scripts/scan-tools.sh | 12 |
2 files changed, 6 insertions, 58 deletions
diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index 2784f6c1c..c90760b6e 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -65,26 +65,15 @@ if [[ -n $ADK_PACKAGE_LIBX11 ]]; then NEED_X11="$NEED_X11 libx11" fi -if [[ -n $ADK_PACKAGE_LIBVPX ]]; then - NEED_YASM="$NEED_YASM libvpx" -fi - if [[ -n $ADK_COMPILE_ORBIT2 ]]; then NEED_LIBIDL="$NEED_LIBIDL orbit2" fi -if [[ -n $ADK_PACKAGE_FIREFOX ]]; then - NEED_YASM="$NEED_YASM firefox" - NEED_LIBIDL="$NEED_LIBIDL firefox" - NEED_ZIP="$NEED_ZIP firefox" -fi - if [[ -n $ADK_PACKAGE_MESALIB ]]; then NEED_MAKEDEPEND="$NEED_MAKEDEPEND mesalib" fi if [[ -n $ADK_COMPILE_OPENJDK ]]; then - NEED_ZIP="$NEED_ZIP openjdk" NEED_GXX="$NEED_GXX openjdk" NEED_XSLTPROC="$NEED_XSLTPROC openjdk" fi @@ -95,10 +84,6 @@ if [[ -n $ADK_COMPILE_OPENJDK ]]; then fi if [[ -n $ADK_COMPILE_OPENJDK7 ]]; then - NEED_ZIP="$NEED_ZIP openjdk7" -fi - -if [[ -n $ADK_COMPILE_OPENJDK7 ]]; then cd ${TOPDIR}/jtools; bash prereq.sh [ $? -ne 0 ] && out=1 fi @@ -136,10 +121,6 @@ if [[ -n $ADK_PACKAGE_EGLIBC ]]; then NEED_GPERF="$NEED_GPERF eglibc" fi -if [[ -n $ADK_PACKAGE_GLIB ]]; then - NEED_GETTEXT="$NEED_GETTEXT glib" -fi - if [[ -n $ADK_PACKAGE_YAJL ]]; then NEED_RUBY="$NEED_RUBY yajl" fi @@ -165,16 +146,6 @@ if [[ -n $ADK_PACKAGE_FONT_ADOBE_75DPI ]]; then NEED_MKFONTDIR="$NEED_MKFONTDIR font-adobe-75dpi" fi -if [[ -n $NEED_GETTEXT ]]; then - if ! which gettext >/dev/null 2>&1; then - echo >&2 You need gettext to build $NEED_GETTEXT - out=1 - elif ! which msgfmt >/dev/null 2>&1; then - echo >&2 You need msgfmt to build $NEED_GETTEXT - out=1 - fi -fi - if [[ -n $NEED_LIBTIRPCDEV ]];then if ! test -f /usr/include/tirpc/netconfig.h >/dev/null; then echo >&2 You need tirpc headers to build $NEED_LIBTIRPCDEV @@ -309,20 +280,6 @@ if [[ -n $NEED_WWW ]]; then fi fi -if [[ -n $NEED_ZIP ]]; then - if ! which zip >/dev/null 2>&1; then - echo >&2 You need zip to build $NEED_ZIP - out=1 - fi -fi - -if [[ -n $NEED_LIBIDL ]]; then - if ! which libIDL-config-2 >/dev/null 2>&1; then - echo >&2 You need libIDL-config-2 to build $NEED_LIBIDL - out=1 - fi -fi - if [[ -n $NEED_SWIG ]]; then if ! which swig >/dev/null 2>&1; then echo >&2 You need swig to build $NEED_SWIG @@ -365,15 +322,6 @@ if [[ -n $NEED_RPM ]]; then fi fi -if [[ -n $ADK_LINUX_X86 ]]; then - if [[ -n $NEED_YASM ]]; then - if ! which yasm >/dev/null 2>&1; then - echo >&2 You need yasm to build $NEED_YASM - out=1 - fi - fi -fi - if [[ -n $NEED_XSLTPROC ]]; then if ! which xsltproc >/dev/null 2>&1; then echo >&2 You need xsltproc to build $NEED_XSLTPROC diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh index 0b7b1d08c..a060d24fc 100644 --- a/scripts/scan-tools.sh +++ b/scripts/scan-tools.sh @@ -112,6 +112,12 @@ if ! which gzip >/dev/null 2>&1; then out=1 fi +if ! which bzip2 >/dev/null 2>&1; then + echo You must install bzip2 to continue. + echo + out=1 +fi + if ! which lzop >/dev/null 2>&1; then echo You must install lzop to continue. echo @@ -130,12 +136,6 @@ if ! which xz >/dev/null 2>&1; then out=1 fi -if ! which bzip2 >/dev/null 2>&1; then - echo You must install bzip2 to continue. - echo - out=1 -fi - if ! which patch >/dev/null 2>&1; then echo You must install patch to continue. echo |