diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-31 08:52:35 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-31 08:52:35 +0100 |
| commit | f25b3442d6f58604117dfe73506e4d79f95c59d6 (patch) | |
| tree | 00dc4be5b7e2c3fee02f0fbed7ba626ff6fbae35 /scripts | |
| parent | 94722f640dd0851e151211c4399bcade1c82a37c (diff) | |
| parent | a5e18941597f35dde5681ab76e9b2d2b8ec07786 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/scan-pkgs.sh | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index 74e13ddf0..985009051 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -23,13 +23,6 @@ out=0 . $topdir/.config -uname -a|grep '\(Debian\|Ubuntu\)' >/dev/null 2>&1 -if [ $? -eq 0 ];then - if [[ -n $ADK_COMPILE_PYTHON2 ]]; then - NEED_DPKG_ARCHITECTURE="$NEED_DPKG_ARCHITECTURE python2" - fi -fi - if [[ -n $ADK_NATIVE ]];then if [[ -n $ADK_PACKAGE_NEON ]];then NEED_LIBXML2_DEV="$NEED_LIBXML2_DEV neon" @@ -91,7 +84,6 @@ fi if [[ -n $ADK_PACKAGE_FIREFOX ]]; then NEED_YASM="$NEED_YASM firefox" NEED_LIBIDL="$NEED_LIBIDL firefox" - NEED_PYTHON="$NEED_PYTHON firefox" NEED_ZIP="$NEED_ZIP firefox" fi @@ -448,15 +440,6 @@ if [[ -n $NEED_DBUSGLIB ]]; then fi fi -if [[ -n $NEED_PYTHON ]]; then - if ! which python >/dev/null 2>&1; then - if ! test -x /usr/pkg/bin/python2.6 >/dev/null; then - echo >&2 You need python to build $NEED_PYTHON - out=1 - fi - fi -fi - if [[ -n $NEED_MAKEDEPEND ]]; then if ! which makedepend >/dev/null 2>&1; then echo >&2 You need makedepend to build $NEED_MAKEDEPEND @@ -464,13 +447,6 @@ if [[ -n $NEED_MAKEDEPEND ]]; then fi fi -if [[ -n $NEED_DPKG_ARCHITECTURE ]]; then - if ! which dpkg-architecture >/dev/null 2>&1; then - echo >&2 You need dpkg-architecture to build $NEED_DPKG_ARCHITECTURE - out=1 - fi -fi - if [[ -n $ADK_USE_CCACHE ]]; then if ! which ccache >/dev/null 2>&1; then echo >&2 You have selected to build with ccache, but ccache could not be found. |