From 7b23ed2098a6fa8f2741b6b5b84310fd9bb4f872 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 14 Nov 2013 10:01:21 +0100 Subject: remove zip and libIDL dependency, firefox does not need libIDL anymore. need to fix orbit2 --- scripts/scan-pkgs.sh | 38 -------------------------------------- 1 file changed, 38 deletions(-) (limited to 'scripts/scan-pkgs.sh') diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index 874ee63a7..c90760b6e 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -69,17 +69,11 @@ if [[ -n $ADK_COMPILE_ORBIT2 ]]; then NEED_LIBIDL="$NEED_LIBIDL orbit2" fi -if [[ -n $ADK_PACKAGE_FIREFOX ]]; then - 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 @@ -89,10 +83,6 @@ if [[ -n $ADK_COMPILE_OPENJDK ]]; then [ $? -ne 0 ] && out=1 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 @@ -131,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 @@ -160,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 @@ -304,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 -- cgit v1.2.3