diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-29 09:06:27 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-29 09:06:27 +0100 |
commit | 40fcb885d64153d3196f8a6ad8ca9a679b4a61b5 (patch) | |
tree | c65da15b51c5fcf5dd5e5f2c038fa57455b03a21 /scripts | |
parent | ede0b881160024db41b69198207a3e9905eea6c9 (diff) | |
parent | 50dc4372e21202d2e285bd295ec18c759b66c4d9 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/find | 14 | ||||
-rw-r--r-- | scripts/scan-pkgs.sh | 15 |
2 files changed, 0 insertions, 29 deletions
diff --git a/scripts/find b/scripts/find deleted file mode 100755 index 439ec0b3f..000000000 --- a/scripts/find +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -find=$(which find) -os=$(uname) -case $os in - Darwin) - /opt/local/libexec/gnubin/find "$@" - ;; - *) - /usr/bin/find "$@" - ;; -esac diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index c94d01138..79d416569 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -61,21 +61,6 @@ if [[ -n $ADK_NATIVE ]];then fi fi -if [[ -n $ADK_COMPILE_OPENJDK ]]; then - NEED_GXX="$NEED_GXX openjdk" - NEED_XSLTPROC="$NEED_XSLTPROC openjdk" -fi - -if [[ -n $ADK_COMPILE_OPENJDK ]]; then - cd ${TOPDIR}/jtools; bash prereq.sh - [ $? -ne 0 ] && out=1 -fi - -if [[ -n $ADK_COMPILE_OPENJDK7 ]]; then - cd ${TOPDIR}/jtools; bash prereq.sh - [ $? -ne 0 ] && out=1 -fi - if [[ -n $ADK_PACKAGE_XKEYBOARD_CONFIG ]]; then NEED_XKBCOMP="$NEED_XKBCOMP xkeyboard-config" fi |