tree-wide: Migrate to using `TERMUX_PYTHON_VERSION` variable
%ci:no-build Co-authored-by: Maxython <mixython@gmail.com>
This commit is contained in:
parent
5a29e62c76
commit
45147db2a8
|
@ -29,8 +29,7 @@ termux_step_make_install() {
|
||||||
|
|
||||||
CC= CXX= LDFLAGS= CXXFLAGS= ./bootstrap.sh
|
CC= CXX= LDFLAGS= CXXFLAGS= ./bootstrap.sh
|
||||||
echo "using clang : $TERMUX_ARCH : $CXX : <linkflags>-L$TERMUX_PREFIX/lib ; " >> project-config.jam
|
echo "using clang : $TERMUX_ARCH : $CXX : <linkflags>-L$TERMUX_PREFIX/lib ; " >> project-config.jam
|
||||||
local _PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
|
echo "using python : ${TERMUX_PYTHON_VERSION} : $TERMUX_PREFIX/bin/python3 : $TERMUX_PREFIX/include/python${TERMUX_PYTHON_VERSION} : $TERMUX_PREFIX/lib ;" >> project-config.jam
|
||||||
echo "using python : ${_PYTHON_VERSION} : $TERMUX_PREFIX/bin/python3 : $TERMUX_PREFIX/include/python${_PYTHON_VERSION} : $TERMUX_PREFIX/lib ;" >> project-config.jam
|
|
||||||
|
|
||||||
if [ "$TERMUX_ARCH" = arm ] || [ "$TERMUX_ARCH" = aarch64 ]; then
|
if [ "$TERMUX_ARCH" = arm ] || [ "$TERMUX_ARCH" = aarch64 ]; then
|
||||||
BOOSTARCH=arm
|
BOOSTARCH=arm
|
||||||
|
|
|
@ -20,11 +20,10 @@ TERMUX_PKG_CONFLICTS="gcc, clang (<< 3.9.1-3)"
|
||||||
TERMUX_PKG_BREAKS="libclang, libclang-dev, libllvm-dev"
|
TERMUX_PKG_BREAKS="libclang, libclang-dev, libllvm-dev"
|
||||||
TERMUX_PKG_REPLACES="gcc, libclang, libclang-dev, libllvm-dev"
|
TERMUX_PKG_REPLACES="gcc, libclang, libclang-dev, libllvm-dev"
|
||||||
TERMUX_PKG_GROUPS="base-devel"
|
TERMUX_PKG_GROUPS="base-devel"
|
||||||
_PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
|
|
||||||
# See http://llvm.org/docs/CMake.html:
|
# See http://llvm.org/docs/CMake.html:
|
||||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
|
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
|
||||||
-DANDROID_PLATFORM_LEVEL=$TERMUX_PKG_API_LEVEL
|
-DANDROID_PLATFORM_LEVEL=$TERMUX_PKG_API_LEVEL
|
||||||
-DPYTHON_EXECUTABLE=$(command -v python${_PYTHON_VERSION})
|
-DPYTHON_EXECUTABLE=$(command -v python${TERMUX_PYTHON_VERSION})
|
||||||
-DLLVM_ENABLE_PIC=ON
|
-DLLVM_ENABLE_PIC=ON
|
||||||
-DLLVM_ENABLE_PROJECTS=clang;clang-tools-extra;compiler-rt;lld;lldb;mlir;openmp;polly
|
-DLLVM_ENABLE_PROJECTS=clang;clang-tools-extra;compiler-rt;lld;lldb;mlir;openmp;polly
|
||||||
-DLLVM_ENABLE_LIBEDIT=OFF
|
-DLLVM_ENABLE_LIBEDIT=OFF
|
||||||
|
@ -37,9 +36,9 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
|
||||||
-DDEFAULT_SYSROOT=$(dirname $TERMUX_PREFIX/)
|
-DDEFAULT_SYSROOT=$(dirname $TERMUX_PREFIX/)
|
||||||
-DLLVM_LINK_LLVM_DYLIB=ON
|
-DLLVM_LINK_LLVM_DYLIB=ON
|
||||||
-DLLDB_ENABLE_PYTHON=ON
|
-DLLDB_ENABLE_PYTHON=ON
|
||||||
-DLLDB_PYTHON_RELATIVE_PATH=lib/python${_PYTHON_VERSION}/site-packages
|
-DLLDB_PYTHON_RELATIVE_PATH=lib/python${TERMUX_PYTHON_VERSION}/site-packages
|
||||||
-DLLDB_PYTHON_EXE_RELATIVE_PATH=bin/python${_PYTHON_VERSION}
|
-DLLDB_PYTHON_EXE_RELATIVE_PATH=bin/python${TERMUX_PYTHON_VERSION}
|
||||||
-DLLDB_PYTHON_EXT_SUFFIX=.cpython-${_PYTHON_VERSION}.so
|
-DLLDB_PYTHON_EXT_SUFFIX=.cpython-${TERMUX_PYTHON_VERSION}.so
|
||||||
-DCLANG_TABLEGEN=$TERMUX_PKG_HOSTBUILD_DIR/bin/clang-tblgen
|
-DCLANG_TABLEGEN=$TERMUX_PKG_HOSTBUILD_DIR/bin/clang-tblgen
|
||||||
-DCLANG_PSEUDO_GEN=$TERMUX_PKG_HOSTBUILD_DIR/bin/clang-pseudo-gen
|
-DCLANG_PSEUDO_GEN=$TERMUX_PKG_HOSTBUILD_DIR/bin/clang-pseudo-gen
|
||||||
-DCLANG_TIDY_CONFUSABLE_CHARS_GEN=$TERMUX_PKG_HOSTBUILD_DIR/bin/clang-tidy-confusable-chars-gen
|
-DCLANG_TIDY_CONFUSABLE_CHARS_GEN=$TERMUX_PKG_HOSTBUILD_DIR/bin/clang-tidy-confusable-chars-gen
|
||||||
|
|
|
@ -2,7 +2,7 @@ TERMUX_SUBPKG_INCLUDE="
|
||||||
bin/lldb*
|
bin/lldb*
|
||||||
include/lldb/
|
include/lldb/
|
||||||
lib/liblldb.so
|
lib/liblldb.so
|
||||||
lib/python${_PYTHON_VERSION}/site-packages
|
lib/python${TERMUX_PYTHON_VERSION}/site-packages
|
||||||
"
|
"
|
||||||
TERMUX_SUBPKG_DESCRIPTION="LLVM-based debugger"
|
TERMUX_SUBPKG_DESCRIPTION="LLVM-based debugger"
|
||||||
TERMUX_SUBPKG_DEPENDS="libc++, libedit, libxml2, python, ncurses-ui-libs"
|
TERMUX_SUBPKG_DEPENDS="libc++, libedit, libxml2, python, ncurses-ui-libs"
|
||||||
|
|
|
@ -12,6 +12,5 @@ TERMUX_PKG_REPLACES="libsearpc-dev"
|
||||||
|
|
||||||
termux_step_post_get_source() {
|
termux_step_post_get_source() {
|
||||||
./autogen.sh
|
./autogen.sh
|
||||||
local _PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
|
export PYTHON="python${TERMUX_PYTHON_VERSION}"
|
||||||
export PYTHON="python${_PYTHON_VERSION}"
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,9 +5,8 @@ TERMUX_PKG_MAINTAINER="@termux"
|
||||||
TERMUX_PKG_VERSION=0.13
|
TERMUX_PKG_VERSION=0.13
|
||||||
TERMUX_PKG_SRCURL=https://github.com/namhyung/uftrace/archive/v${TERMUX_PKG_VERSION}.tar.gz
|
TERMUX_PKG_SRCURL=https://github.com/namhyung/uftrace/archive/v${TERMUX_PKG_VERSION}.tar.gz
|
||||||
TERMUX_PKG_SHA256=cffae82c68446c20cc3c7e87e71e57498805767a0d4085b4846f3c49f9e472d9
|
TERMUX_PKG_SHA256=cffae82c68446c20cc3c7e87e71e57498805767a0d4085b4846f3c49f9e472d9
|
||||||
# Hardcoded libpython${_PYTHON_VERSION}.so is dlopen(3)ed by uftrace.
|
# Hardcoded libpython${TERMUX_PYTHON_VERSION}.so is dlopen(3)ed by uftrace.
|
||||||
# Please revbump and rebuild when bumping _PYTHON_VERSION, where
|
# Please revbump and rebuild when bumping TERMUX_PYTHON_VERSION.
|
||||||
# _PYTHON_VERSION == _MAJOR_VERSION in build.sh of python package.
|
|
||||||
# libandroid-{execinfo,spawn} are dlopen(3)ed.
|
# libandroid-{execinfo,spawn} are dlopen(3)ed.
|
||||||
TERMUX_PKG_DEPENDS="capstone, libandroid-execinfo, libandroid-glob, libandroid-spawn, libc++, libdw, libelf, libluajit, ncurses, python"
|
TERMUX_PKG_DEPENDS="capstone, libandroid-execinfo, libandroid-glob, libandroid-spawn, libc++, libdw, libelf, libluajit, ncurses, python"
|
||||||
TERMUX_PKG_AUTO_UPDATE=true
|
TERMUX_PKG_AUTO_UPDATE=true
|
||||||
|
|
|
@ -16,15 +16,14 @@ termux_step_post_get_source() {
|
||||||
}
|
}
|
||||||
|
|
||||||
termux_step_pre_configure() {
|
termux_step_pre_configure() {
|
||||||
_PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
|
|
||||||
export UWSGI_PYTHON_NOLIB=true
|
export UWSGI_PYTHON_NOLIB=true
|
||||||
export UWSGI_INCLUDES="$TERMUX_PREFIX/include"
|
export UWSGI_INCLUDES="$TERMUX_PREFIX/include"
|
||||||
export APPEND_CFLAGS="$CPPFLAGS
|
export APPEND_CFLAGS="$CPPFLAGS
|
||||||
-I$TERMUX_PREFIX/include/python${_PYTHON_VERSION}
|
-I$TERMUX_PREFIX/include/python${TERMUX_PYTHON_VERSION}
|
||||||
-DOBSOLETE_LINUX_KERNEL
|
-DOBSOLETE_LINUX_KERNEL
|
||||||
"
|
"
|
||||||
LDFLAGS+="
|
LDFLAGS+="
|
||||||
-lpython${_PYTHON_VERSION}
|
-lpython${TERMUX_PYTHON_VERSION}
|
||||||
-landroid-glob
|
-landroid-glob
|
||||||
-landroid-sysv-semaphore
|
-landroid-sysv-semaphore
|
||||||
"
|
"
|
||||||
|
|
|
@ -39,19 +39,18 @@ TERMUX_PKG_CONFFILES="share/vim/vimrc"
|
||||||
|
|
||||||
# vim-python:
|
# vim-python:
|
||||||
TERMUX_PKG_CONFLICTS="vim"
|
TERMUX_PKG_CONFLICTS="vim"
|
||||||
_PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
|
|
||||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+="
|
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+="
|
||||||
vi_cv_path_python3_pfx=$TERMUX_PREFIX
|
vi_cv_path_python3_pfx=$TERMUX_PREFIX
|
||||||
vi_cv_var_python3_abiflags=
|
vi_cv_var_python3_abiflags=
|
||||||
vi_cv_var_python3_version=${_PYTHON_VERSION}
|
vi_cv_var_python3_version=${TERMUX_PYTHON_VERSION}
|
||||||
--enable-python3interp
|
--enable-python3interp
|
||||||
--with-python3-config-dir=$TERMUX_PREFIX/lib/python${_PYTHON_VERSION}/config-${_PYTHON_VERSION}/
|
--with-python3-config-dir=$TERMUX_PREFIX/lib/python${TERMUX_PYTHON_VERSION}/config-${TERMUX_PYTHON_VERSION}/
|
||||||
"
|
"
|
||||||
TERMUX_PKG_DESCRIPTION+=" - with python support"
|
TERMUX_PKG_DESCRIPTION+=" - with python support"
|
||||||
# Remove share/vim/vim90 which is in vim-runtime built as a subpackage of vim:
|
# Remove share/vim/vim90 which is in vim-runtime built as a subpackage of vim:
|
||||||
TERMUX_PKG_RM_AFTER_INSTALL+=" share/vim/vim90"
|
TERMUX_PKG_RM_AFTER_INSTALL+=" share/vim/vim90"
|
||||||
termux_step_pre_configure() {
|
termux_step_pre_configure() {
|
||||||
CPPFLAGS+=" -I${TERMUX_PREFIX}/include/python${_PYTHON_VERSION}"
|
CPPFLAGS+=" -I${TERMUX_PREFIX}/include/python${TERMUX_PYTHON_VERSION}"
|
||||||
}
|
}
|
||||||
|
|
||||||
termux_step_pre_configure() {
|
termux_step_pre_configure() {
|
||||||
|
|
|
@ -10,8 +10,7 @@ TERMUX_PKG_SHA256=7072beb1f680a2fe3f9e535b797c146d22528990c72f63ddb49d2f350a3653
|
||||||
TERMUX_PKG_PLATFORM_INDEPENDENT=true
|
TERMUX_PKG_PLATFORM_INDEPENDENT=true
|
||||||
TERMUX_PKG_CONFLICTS="xcbproto"
|
TERMUX_PKG_CONFLICTS="xcbproto"
|
||||||
TERMUX_PKG_REPLACES="xcbproto"
|
TERMUX_PKG_REPLACES="xcbproto"
|
||||||
_PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
|
|
||||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
|
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
|
||||||
PYTHON=python${_PYTHON_VERSION}
|
PYTHON=python${TERMUX_PYTHON_VERSION}
|
||||||
am_cv_python_pythondir=$TERMUX_PREFIX/lib/python${_PYTHON_VERSION}/site-packages
|
am_cv_python_pythondir=$TERMUX_PREFIX/lib/python${TERMUX_PYTHON_VERSION}/site-packages
|
||||||
"
|
"
|
||||||
|
|
|
@ -13,13 +13,12 @@ TERMUX_PKG_DEPENDS="gdk-pixbuf, glib, gtk3, libcairo, libcanberra, libice, libic
|
||||||
TERMUX_PKG_CONFLICTS="vim, vim-python, vim-runtime"
|
TERMUX_PKG_CONFLICTS="vim, vim-python, vim-runtime"
|
||||||
TERMUX_PKG_BUILD_IN_SRC=true
|
TERMUX_PKG_BUILD_IN_SRC=true
|
||||||
|
|
||||||
_PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
|
|
||||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
|
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
|
||||||
ac_cv_small_wchar_t=no
|
ac_cv_small_wchar_t=no
|
||||||
ac_cv_path_vi_cv_path_plain_lua=lua5.2
|
ac_cv_path_vi_cv_path_plain_lua=lua5.2
|
||||||
vi_cv_path_python3_pfx=$TERMUX_PREFIX
|
vi_cv_path_python3_pfx=$TERMUX_PREFIX
|
||||||
vi_cv_var_python3_abiflags=
|
vi_cv_var_python3_abiflags=
|
||||||
vi_cv_var_python3_version=${_PYTHON_VERSION}
|
vi_cv_var_python3_version=${TERMUX_PYTHON_VERSION}
|
||||||
vim_cv_getcwd_broken=no
|
vim_cv_getcwd_broken=no
|
||||||
vim_cv_memmove_handles_overlap=yes
|
vim_cv_memmove_handles_overlap=yes
|
||||||
vim_cv_stat_ignores_slash=no
|
vim_cv_stat_ignores_slash=no
|
||||||
|
@ -34,7 +33,7 @@ vim_cv_tty_group=world
|
||||||
--enable-python3interp
|
--enable-python3interp
|
||||||
--with-features=huge
|
--with-features=huge
|
||||||
--with-lua-prefix=$TERMUX_PREFIX
|
--with-lua-prefix=$TERMUX_PREFIX
|
||||||
--with-python3-config-dir=$TERMUX_PREFIX/lib/python${_PYTHON_VERSION}/config-${_PYTHON_VERSION}/
|
--with-python3-config-dir=$TERMUX_PREFIX/lib/python${TERMUX_PYTHON_VERSION}/config-${TERMUX_PYTHON_VERSION}/
|
||||||
--with-tlib=ncursesw
|
--with-tlib=ncursesw
|
||||||
--with-x"
|
--with-x"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue