diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-24 18:27:33 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-24 18:27:33 +0100 |
| commit | 148249d08af2ef833175d3f9176c6709798d4a14 (patch) | |
| tree | dc39146d700ae5a224c45885719a2bc8934bd7eb /scripts | |
| parent | 18a6922a938023cb061b7cd9895412549cb17288 (diff) | |
| parent | 826fae84981bf030b6bb9d20117a1a1634ba3334 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/adkprepare.sh | 1 | ||||
| -rwxr-xr-x | scripts/m4 | 9 | ||||
| -rw-r--r-- | scripts/scan-pkgs.sh | 15 |
3 files changed, 1 insertions, 24 deletions
diff --git a/scripts/adkprepare.sh b/scripts/adkprepare.sh index b526371ef..022a978c1 100755 --- a/scripts/adkprepare.sh +++ b/scripts/adkprepare.sh @@ -34,6 +34,7 @@ openbsd() { pkg_add -v intltool pkg_add -v screen-- pkg_add -v vim--no_x11 + pkg_add -v py-libxml } netbsd() { diff --git a/scripts/m4 b/scripts/m4 deleted file mode 100755 index 8456bce21..000000000 --- a/scripts/m4 +++ /dev/null @@ -1,9 +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. - -if [ -z "$(which gm4 2>/dev/null)" ];then - /usr/bin/m4 "$@" -else - gm4 "$@" -fi 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 |