setup-ubuntu.sh: install pip if using deadsnakes

This commit is contained in:
Lucy Phipps 2021-10-06 01:22:50 +01:00
parent 9ce4c746c4
commit e644c07401
No known key found for this signature in database
GPG Key ID: 8F688A3DB7869BFE
24 changed files with 44 additions and 37 deletions

View File

@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Text document format for short documents, articles, book
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=9.1.1
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://github.com/asciidoc/asciidoc-py3/archive/${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=914dfc1542c30bd47faa0aaaae0985cb57d0ca584015729ccd1b94d90da3a616
TERMUX_PKG_AUTO_UPDATE=true

View File

@ -3,14 +3,14 @@ TERMUX_PKG_DESCRIPTION="Deduplicating and compressing backup program"
TERMUX_PKG_LICENSE="BSD 3-Clause"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=1.1.17
TERMUX_PKG_REVISION=2
TERMUX_PKG_REVISION=3
TERMUX_PKG_SRCURL=https://github.com/borgbackup/borg/releases/download/${TERMUX_PKG_VERSION}/borgbackup-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=7ab924fc017b24929bedceba0dcce16d56f9868bf9b5050d2aae2eb080671674
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_DEPENDS="libacl, liblz4, openssl, python, zstd"
TERMUX_PKG_BUILD_IN_SRC=true
_PYTHON_VERSION=3.9
_PYTHON_VERSION=3.10
TERMUX_PKG_RM_AFTER_INSTALL="
lib/python${_PYTHON_VERSION}/site-packages/easy-install.pth

View File

@ -83,14 +83,6 @@ index 87e93d25..5ca79af2 100644
}
ext_modules = []
@@ -882,7 +875,6 @@ def run(self):
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
- 'Programming Language :: Python :: 3.10',
'Topic :: Security :: Cryptography',
'Topic :: System :: Archiving :: Backup',
],
diff --git a/src/borg/__init__.py b/src/borg/__init__.py
index 9f13c7d6..47adb1b6 100644
--- a/src/borg/__init__.py

View File

@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="calcurse is a calendar and scheduling application for th
TERMUX_PKG_LICENSE="BSD 2-Clause"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=4.7.1
TERMUX_PKG_REVISION=1
TERMUX_PKG_REVISION=2
TERMUX_PKG_SRCURL=https://calcurse.org/files/calcurse-$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=0a7c55d07674569d166c0b0e7587b2972d3da8160cdb7d60b1dbd2895803afb0
TERMUX_PKG_DEPENDS="libandroid-support, ncurses"

View File

@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://emscripten.org
TERMUX_PKG_DESCRIPTION="Emscripten: An LLVM-to-WebAssembly Compiler"
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="@truboxl"
TERMUX_PKG_VERSION=2.0.29
TERMUX_PKG_VERSION=2.0.31
TERMUX_PKG_SRCURL=https://github.com/emscripten-core/emscripten.git
TERMUX_PKG_GIT_BRANCH=$TERMUX_PKG_VERSION
TERMUX_PKG_DEPENDS="python, nodejs, debianutils"

View File

@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="The standard GNU Debugger that runs on many Unix-like sy
TERMUX_PKG_LICENSE="GPL-3.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=10.1
TERMUX_PKG_REVISION=1
TERMUX_PKG_REVISION=2
TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/gdb/gdb-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0
TERMUX_PKG_DEPENDS="libc++, liblzma, libexpat, readline, ncurses, libmpfr, python, zlib"

View File

@ -2,12 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://gi.readthedocs.io/
TERMUX_PKG_DESCRIPTION="Uniform machine readable API"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_VERSION=1.68.0
TERMUX_PKG_REVISION=1
TERMUX_PKG_REVISION=2
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_SRCURL=https://github.com/GNOME/gobject-introspection/archive/refs/tags/$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=13595a257df7d0b71b002ec115f1faafd3295c9516f307e2c57bd219d5cd8369
TERMUX_PKG_BUILD_DEPENDS="glib, python"
termux_step_pre_configure() {
CPPFLAGS+=" -I$TERMUX_PREFIX/include/python3.9 -I$TERMUX_PREFIX/include/python3.9/cpython"
CPPFLAGS+=" -I$TERMUX_PREFIX/include/python3.10 -I$TERMUX_PREFIX/include/python3.10/cpython"
}

View File

@ -34,7 +34,7 @@ diff -uNr gobject-introspection/meson.build gobject-introspection.mod/meson.buil
meson_version: '>= 0.50.1',
default_options: [
'warning_level=1',
+ 'c_link_args=-lpython3.9',
+ 'c_link_args=-lpython3.10',
'buildtype=debugoptimized',
],
)

View File

@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="A tool to analyze #includes in C and C++ source files"
TERMUX_PKG_LICENSE=NCSA
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=0.16
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://github.com/include-what-you-use/include-what-you-use/archive/$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=313e92b4fe38f99a0bbae3ba16c5eb2c54b821b6263e7745e1dd4b4eca08d948
TERMUX_PKG_AUTO_UPDATE=true

View File

@ -7,7 +7,7 @@ index 30d97cb9..341e782e 100644
install(
FILES "${CMAKE_BINARY_DIR}/${_ledger_python_module_name}"
- DESTINATION ${Python_SITEARCH})
+ DESTINATION @TERMUX_PREFIX@/lib/python3.9/site-packages/)
+ DESTINATION @TERMUX_PREFIX@/lib/python3.10/site-packages/)
else()
message(WARNING "Python_SITEARCH not set. Will not install python module.")
endif()

View File

@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Powerful, double-entry accounting system"
TERMUX_PKG_LICENSE="BSD 3-Clause"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=3.2.1
TERMUX_PKG_REVISION=4
TERMUX_PKG_REVISION=5
TERMUX_PKG_SRCURL=https://github.com/ledger/ledger/archive/v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=92bf09bc385b171987f456fe3ee9fa998ed5e40b97b3acdd562b663aa364384a
TERMUX_PKG_AUTO_UPDATE=true

View File

@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="A simple C language RPC framework (mainly for seafile)"
TERMUX_PKG_LICENSE="Apache-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=1:3.2.0
TERMUX_PKG_REVISION=1
TERMUX_PKG_REVISION=2
TERMUX_PKG_SRCURL=https://github.com/haiwen/libsearpc/archive/v${TERMUX_PKG_VERSION:2}.tar.gz
TERMUX_PKG_SHA256=cd00197fcc40b45b1d5e892b2d08dfa5947f737e0d80f3ef26419334e75b0bff
TERMUX_PKG_DEPENDS="glib, libjansson, python"
@ -12,5 +12,5 @@ TERMUX_PKG_REPLACES="libsearpc-dev"
termux_step_post_get_source() {
./autogen.sh
export PYTHON="python3.9"
export PYTHON="python3.10"
}

View File

@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Facebook PathPicker - a terminal-based file picker"
TERMUX_PKG_LICENSE="BSD 3-Clause"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=0.9.2
TERMUX_PKG_REVISION=1
TERMUX_PKG_REVISION=2
TERMUX_PKG_SRCURL=https://github.com/facebook/PathPicker/archive/${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=4b3deac0100fb9405adca17a1c75e133359a6cbb1351c392276a55ef8ef40857
TERMUX_PKG_AUTO_UPDATE=true

View File

@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Profanity is a console based XMPP client written in C us
TERMUX_PKG_LICENSE="GPL-3.0"
TERMUX_PKG_MAINTAINER="Oliver Schmidhauser @Neo-Oli"
TERMUX_PKG_VERSION=0.11.1
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://github.com/profanity-im/profanity/releases/download/$TERMUX_PKG_VERSION/profanity-$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=6f1b4df6c2971f51d03d48d2bfd4f69b4404410d800b43f029ea1cf08a02bd45
TERMUX_PKG_AUTO_UPDATE=true
@ -15,8 +16,8 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-python-plugins --without-xscreensave
TERMUX_PKG_BUILD_IN_SRC=true
termux_step_pre_configure() {
CPPFLAGS+=" -I$TERMUX_PREFIX/include/python3.9"
LDFLAGS+=" -lpython3.9"
CPPFLAGS+=" -I$TERMUX_PREFIX/include/python3.10"
LDFLAGS+=" -lpython3.10"
}
termux_step_post_configure() {

View File

@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="File manager with VI key bindings"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=1.9.3
TERMUX_PKG_REVISION=1
TERMUX_PKG_REVISION=2
TERMUX_PKG_SRCURL=https://github.com/ranger/ranger/archive/v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=ce088a04c91c25263a9675dc5c43514b7ec1b38c8ea43d9a9d00923ff6cdd251
TERMUX_PKG_DEPENDS="python, file"
@ -15,7 +15,7 @@ termux_step_make() {
}
termux_step_make_install() {
python3.9 setup.py install --prefix=$TERMUX_PREFIX --force
python3.10 setup.py install --prefix=$TERMUX_PREFIX --force
}
termux_step_post_massage() {

View File

@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="A utility for local/remote mirroring and incremental bac
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=2.0.5
TERMUX_PKG_REVISION=1
TERMUX_PKG_REVISION=2
TERMUX_PKG_SRCURL=https://github.com/rdiff-backup/rdiff-backup/releases/download/v${TERMUX_PKG_VERSION/\~/}/rdiff-backup-${TERMUX_PKG_VERSION/\~/}.tar.gz
TERMUX_PKG_SHA256=2bb7837b4a9712b6efaebfa7da8ed6348ffcb02fcecff0e19d8fff732e933b87
TERMUX_PKG_AUTO_UPDATE=true
@ -15,7 +15,7 @@ termux_step_make() {
}
termux_step_make_install() {
local _PYTHON_VERSION=3.9
local _PYTHON_VERSION=3.10
export PYTHONPATH=$TERMUX_PREFIX/lib/python${_PYTHON_VERSION}/site-packages
export CPPFLAGS+=" -I${TERMUX_PREFIX}/include/python${_PYTHON_VERSION}"
export LDFLAGS+=" -lpython${_PYTHON_VERSION}"

View File

@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Seafile is a file syncing and sharing software with file
TERMUX_PKG_LICENSE="Apache-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=8.0.3
TERMUX_PKG_REVISION=1
TERMUX_PKG_REVISION=2
TERMUX_PKG_SRCURL=https://github.com/haiwen/seafile/archive/v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=a83d5d301cf54819ab96ea0ab53824980efdf6727460b969ce3176b4c5109f6b
TERMUX_PKG_AUTO_UPDATE=true
@ -16,7 +16,7 @@ TERMUX_PKG_BUILD_IN_SRC=true
termux_step_pre_configure() {
./autogen.sh
export CPPFLAGS="-I$TERMUX_PKG_SRCDIR/lib $CPPFLAGS"
export PYTHON="python3.9"
export PYTHON="python3.10"
}
termux_step_post_configure() {

View File

@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Common interface to speech synthesis"
TERMUX_PKG_LICENSE="LGPL-2.1, GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=0.10.2
TERMUX_PKG_REVISION=1
TERMUX_PKG_SHA256=056efb80186f2bfc3f6ef468ab9905ca2d652cc2180b13514b752a9d616a6930
TERMUX_PKG_SRCURL=https://github.com/brailcom/speechd/archive/${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_DEPENDS="dotconf, espeak, glib, libiconv, pulseaudio, python"

View File

@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Function (graph) tracer for user-space"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=0.9.4
TERMUX_PKG_REVISION=2
TERMUX_PKG_REVISION=3
TERMUX_PKG_SRCURL=https://github.com/namhyung/uftrace/archive/v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=418d30c959d3b6d0dcafd55e588a5d414a9984b30f2522a5af004a268824a5a2
TERMUX_PKG_DEPENDS="capstone, libandroid-glob, libandroid-spawn, libelf, libdw, ncurses, python"
@ -11,8 +11,8 @@ TERMUX_PKG_BUILD_DEPENDS="argp"
termux_step_pre_configure() {
# uftrace uses custom configure script implementation, so we need to provide some flags
export CFLAGS="${CFLAGS} -I${TERMUX_PREFIX}/include -I${TERMUX_PREFIX}/include/python3.9 -DEFD_SEMAPHORE=1 -DEF_ARM_ABI_FLOAT_HARD=0x400 -w"
export LDFLAGS="${LDFLAGS} -Wl,--wrap=_Unwind_Resume -landroid-glob -largp -lpython3.9"
export CFLAGS="${CFLAGS} -I${TERMUX_PREFIX}/include -I${TERMUX_PREFIX}/include/python3.10 -DEFD_SEMAPHORE=1 -DEF_ARM_ABI_FLOAT_HARD=0x400 -w"
export LDFLAGS="${LDFLAGS} -Wl,--wrap=_Unwind_Resume -landroid-glob -largp -lpython3.10"
if [ "$TERMUX_ARCH" = "i686" ]; then
export ARCH="i386"

View File

@ -7,6 +7,7 @@ TERMUX_PKG_RECOMMENDS="diffutils"
# vim should only be updated every 50 releases on multiples of 50.
# Update both vim and vim-python to the same version in one PR.
TERMUX_PKG_VERSION=8.2.3450
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL="https://github.com/vim/vim/archive/v${TERMUX_PKG_VERSION}.tar.gz"
TERMUX_PKG_SHA256=bf9f41f8804addf7c875fba32f68ad1588f8f9697fc9b8d51857b6b22f87f570
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
@ -41,15 +42,15 @@ TERMUX_PKG_CONFLICTS="vim"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+="
vi_cv_path_python3_pfx=$TERMUX_PREFIX
vi_cv_var_python3_abiflags=
vi_cv_var_python3_version=3.9
vi_cv_var_python3_version=3.10
--enable-python3interp
--with-python3-config-dir=$TERMUX_PREFIX/lib/python3.9/config-3.9/
--with-python3-config-dir=$TERMUX_PREFIX/lib/python3.10/config-3.10/
"
TERMUX_PKG_DESCRIPTION+=" - with python support"
# Remove share/vim/vim82 which is in vim-runtime built as a subpackage of vim:
TERMUX_PKG_RM_AFTER_INSTALL+=" share/vim/vim82"
termux_step_pre_configure() {
CPPFLAGS+=" -I${TERMUX_PREFIX}/include/python3.9"
CPPFLAGS+=" -I${TERMUX_PREFIX}/include/python3.10"
}
termux_step_pre_configure() {

View File

@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Fast, light and extensible IRC chat client"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=3.0.1
TERMUX_PKG_REVISION=3
TERMUX_PKG_REVISION=4
TERMUX_PKG_SRCURL=https://www.weechat.org/files/src/weechat-${TERMUX_PKG_VERSION}.tar.bz2
TERMUX_PKG_SHA256=63ac24c41e88798ad48bfbe8a7e1fd56ddf24416f86bccd3a53b258a569ca038
TERMUX_PKG_DEPENDS="libiconv, ncurses, libgcrypt, libcurl, libgnutls, libandroid-support, zlib"

View File

@ -4,7 +4,7 @@ TERMUX_PKG_DESCRIPTION="XML-XCB protocol descriptions"
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="Leonid Pliushch <leonid.pliushch@gmail.com>"
TERMUX_PKG_VERSION=1.14.1
TERMUX_PKG_REVISION=3
TERMUX_PKG_REVISION=4
TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/archive/individual/proto/xcb-proto-$TERMUX_PKG_VERSION.tar.xz
TERMUX_PKG_SHA256=f04add9a972ac334ea11d9d7eb4fc7f8883835da3e4859c9afa971efdf57fcc3
TERMUX_PKG_PLATFORM_INDEPENDENT=true

View File

@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Z3 is a theorem prover from Microsoft Research."
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=4.8.12
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://github.com/Z3Prover/z3/archive/z3-$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=e3aaefde68b839299cbc988178529535e66048398f7d083b40c69fe0da55f8b7
TERMUX_PKG_AUTO_UPDATE=true

View File

@ -215,11 +215,20 @@ $SUDO apt-get -yq update
# Newer Python versions for host builds
if dpkg --compare-versions $(lsb_release -rs) lt 21.04; then
$SUDO add-apt-repository -y ppa:deadsnakes/ppa
INSTALL_NEW_PIP3=true
else
INSTALL_NEW_PIP3=false
fi
$SUDO DEBIAN_FRONTEND=noninteractive \
apt-get install -yq --no-install-recommends $PACKAGES
if $INSTALL_NEW_PIP3; then
curl -L --output /tmp/get-pip.py https://bootstrap.pypa.io/pip/get-pip.py
$SUDO python3.10 /tmp/get-pip.py
rm -f /tmp/get-pip.py
fi
# Pip for python2.
curl -L --output /tmp/py2-get-pip.py https://bootstrap.pypa.io/pip/2.7/get-pip.py
$SUDO python2 /tmp/py2-get-pip.py