diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-23 10:47:31 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-23 10:47:31 +0100 |
| commit | 4b7a7c1333333ce0f1567cfda15fb86222be2301 (patch) | |
| tree | 52ca6663c6c95635d7afa18c3cf750280b498c62 /scripts | |
| parent | e31358b57662bb44613874e6cb5d5569309910af (diff) | |
| parent | 103810049b157dc809c82a0136e23fe4276b9750 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/pulseaudio/Makefile
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/scan-pkgs.sh | 15 |
1 files changed, 0 insertions, 15 deletions
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 |