diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-08 14:07:13 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-08 14:07:13 +0200 |
| commit | 4f64f833872a6c83dd95149a553b9ed5258b4efe (patch) | |
| tree | 1d653351e49b62def18e74af5b18d6cb2a848a79 /scripts | |
| parent | ee418b2a37c2e45bd35625157dbc1b59fcacf8c7 (diff) | |
| parent | c20e67a4a06a377a277544a498338fa6a09e9e3f (diff) | |
resolve conflict
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/scan-pkgs.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index 7d94f5976..0eeeeaf7c 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -80,7 +80,14 @@ if [[ -n $ADK_COMPILE_KRB5 ]]; then fi if [[ -n $ADK_COMPILE_OPENJDK ]]; then - NEED_ANT="$NEED_ANT openjdk" + NEED_ZIP="$NEED_ZIP openjdk" + 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_PACKAGE_LIBXCB ]]; then @@ -348,13 +355,6 @@ if [[ -n $NEED_FLEX ]]; then fi fi -if [[ -n $NEED_ANT ]]; then - if ! which ant >/dev/null 2>&1; then - echo >&2 You need ant to build $NEED_OPENJDK - out=1 - fi -fi - if [[ -n $NEED_YASM ]]; then if ! which yasm >/dev/null 2>&1; then echo >&2 You need yasm to build $NEED_YASM |