diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-14 21:23:31 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-14 21:23:31 +0100 |
commit | c80761a85ee89d6804db695962e256e48849cf96 (patch) | |
tree | 33f949ec3569d45be8e1b15ea3dc9007d8ca8acc /scripts/scan-pkgs.sh | |
parent | 6a93fa146ab8c42512f08143b187b032888d2454 (diff) | |
parent | f1590c8f1e959054b9426d923886246c2abec3c1 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'scripts/scan-pkgs.sh')
-rw-r--r-- | scripts/scan-pkgs.sh | 38 |
1 files changed, 0 insertions, 38 deletions
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 @@ -90,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 @@ -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 |