Update the android sdk build tools used

[termux-packages] / scripts / setup-ubuntu.sh

diff --git a/scripts/setup-ubuntu.sh b/scripts/setup-ubuntu.sh
index 043d7b5..fd46696 100755 (executable)
--- a/scripts/setup-ubuntu.sh
+++ b/scripts/setup-ubuntu.sh
@@ -1,39 +1,35 @@
 #!/bin/sh
 
 PACKAGES=""
+PACKAGES="$PACKAGES ant"                       # Used by jack and aptsigner.
 PACKAGES="$PACKAGES asciidoc"
 PACKAGES="$PACKAGES automake"
 PACKAGES="$PACKAGES bison"
-PACKAGES="$PACKAGES cmake"
+PACKAGES="$PACKAGES clang"                     # Used by golang, useful to have same compiler building.
 PACKAGES="$PACKAGES curl"                      # Used for fetching sources.
 PACKAGES="$PACKAGES flex"
 PACKAGES="$PACKAGES gettext"                   # Provides 'msgfmt' which the apt build uses.
 PACKAGES="$PACKAGES git"                       # Used by the neovim build.
 PACKAGES="$PACKAGES help2man"
-PACKAGES="$PACKAGES libc6-dev-i386"            # Needed by luajit host part of the build for <sys/cdefs.h>.
-PACKAGES="$PACKAGES libcurl4-openssl-dev"      # XXX: Needed by apt build.
+PACKAGES="$PACKAGES intltool"                  # Used by qalc build.
 PACKAGES="$PACKAGES libgdk-pixbuf2.0-dev"      # Provides 'gkd-pixbuf-query-loaders' which the librsvg build uses.
 PACKAGES="$PACKAGES libglib2.0-dev"            # Provides 'glib-genmarshal' which the glib build uses.
-PACKAGES="$PACKAGES libncurses5-dev"
 PACKAGES="$PACKAGES libtool-bin"
 PACKAGES="$PACKAGES lzip"
-PACKAGES="$PACKAGES luarocks"                  # Used by the neovim build.
+PACKAGES="$PACKAGES python3.6"
 PACKAGES="$PACKAGES subversion"                        # Used by the netpbm build.
 PACKAGES="$PACKAGES tar"
 PACKAGES="$PACKAGES unzip"
 PACKAGES="$PACKAGES m4"
 PACKAGES="$PACKAGES openjdk-8-jdk"             # Used for android-sdk.
 PACKAGES="$PACKAGES pkg-config"
+PACKAGES="$PACKAGES python-docutils"           # For rst2man, used by mpv.
 PACKAGES="$PACKAGES scons"
 PACKAGES="$PACKAGES texinfo"
 PACKAGES="$PACKAGES xmlto"
 PACKAGES="$PACKAGES xutils-dev"                        # Provides 'makedepend' which the openssl build uses.
-DEBIAN_FRONTEND=noninteractive sudo apt-get install -yq $PACKAGES
 
-# Needed by neovim build:
-sudo luarocks install lpeg
-sudo luarocks install mpack
-sudo luarocks install luabitop
+DEBIAN_FRONTEND=noninteractive sudo apt-get install -yq $PACKAGES
 
 sudo mkdir -p /data/data/com.termux/files/usr
 sudo chown -R `whoami` /data