Compare commits

...
2 Commits
Author SHA1 Message Date
Lucy Phipps a5e94c6b33 libduktape: always install pyyaml 2021-10-05 17:37:34 +01:00
Lucy Phipps 88341f3192 update docker image to Ubuntu 21.04 2021-10-05 17:37:34 +01:00
3 changed files with 9 additions and 13 deletions
+3 -5
View File
@@ -9,11 +9,9 @@ TERMUX_PKG_BREAKS="duktape (<< 2.3.0-1), libduktape-dev"
TERMUX_PKG_BUILD_IN_SRC=true
termux_step_pre_configure() {
if $TERMUX_ON_DEVICE_BUILD; then
# configure.py requires 'yaml' python2 module.
if ! pip2 show pyyaml > /dev/null 2>&1; then
pip2 install pyyaml
fi
# configure.py requires 'yaml' python2 module.
if ! pip2 show pyyaml > /dev/null 2>&1; then
pip2 install pyyaml
fi
}
+1 -1
View File
@@ -4,7 +4,7 @@
# docker push termux/package-builder
# This is done after changing this file or any of the
# scripts/setup-{ubuntu,android-sdk}.sh setup scripts.
FROM ubuntu:20.04
FROM ubuntu:21.04
# Fix locale to avoid warnings:
ENV LANG en_US.UTF-8
+5 -7
View File
@@ -56,8 +56,6 @@ PACKAGES+=" xmlto"
PACKAGES+=" xmltoman"
# Needed by python modules (e.g. asciinema) and some build systems.
PACKAGES+=" python3.7"
PACKAGES+=" python3.8"
PACKAGES+=" python3.9"
PACKAGES+=" python3.10-full"
PACKAGES+=" python3-pip"
@@ -110,7 +108,7 @@ PACKAGES+=" composer"
# Needed by package rust.
PACKAGES+=" libssl-dev" # Needed to build Rust
PACKAGES+=" clang-10"
PACKAGES+=" clang-12"
# Needed for package smalltalk.
PACKAGES+=" libsigsegv-dev"
@@ -134,8 +132,8 @@ PACKAGES+=" luajit"
# Needed by gitea.
PACKAGES+=" npm"
# Needed by libduktape (2.5.0 still uses python2 unfortunately)
PACKAGES+=" python-yaml"
# Needed by libduktape
PACKAGES+=" bc"
# Java.
PACKAGES+=" openjdk-8-jdk openjdk-16-jdk"
@@ -163,8 +161,8 @@ PACKAGES+=" libjansson-dev"
PACKAGES+=" libparse-yapp-perl"
PACKAGES+=" libreadline-dev"
PACKAGES+=" libunistring-dev"
PACKAGES+=" llvm-10-dev"
PACKAGES+=" llvm-10-tools"
PACKAGES+=" llvm-12-dev"
PACKAGES+=" llvm-12-tools"
# Needed by packages in X11 repository.
PACKAGES+=" alex"