Fix hardcoded Python version

%ci:no-build
This commit is contained in:
Tee KOBAYASHI 2022-09-27 10:23:05 +09:00 committed by xtkoba
parent 25e9f772a2
commit 51dc6b4904
8 changed files with 24 additions and 10 deletions

View File

@ -29,7 +29,8 @@ termux_step_make_install() {
CC= CXX= LDFLAGS= CXXFLAGS= ./bootstrap.sh
echo "using clang : $TERMUX_ARCH : $CXX : <linkflags>-L$TERMUX_PREFIX/lib ; " >> project-config.jam
echo "using python : 3.10 : $TERMUX_PREFIX/bin/python3 : $TERMUX_PREFIX/include/python3.10 : $TERMUX_PREFIX/lib ;" >> project-config.jam
local _PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
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
BOOSTARCH=arm

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.10/site-packages/)
+ DESTINATION @TERMUX_PREFIX@/lib/python@PYTHON_VERSION@/site-packages/)
else()
message(WARNING "Python_SITEARCH not set. Will not install python module.")
endif()

View File

@ -17,3 +17,11 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
-DUSE_PYTHON=ON
-DUTFCPP_PATH=$TERMUX_PREFIX/include/utf8cpp
"
termux_step_pre_configure() {
local _PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
sed $TERMUX_PKG_BUILDER_DIR/CMakeLists.diff \
-e "s%@TERMUX_PREFIX@%${TERMUX_PREFIX}%g" \
-e "s%@PYTHON_VERSION@%${_PYTHON_VERSION}%g" \
| patch --silent -p1
}

View File

@ -12,5 +12,6 @@ TERMUX_PKG_REPLACES="libsearpc-dev"
termux_step_post_get_source() {
./autogen.sh
export PYTHON="python3.10"
local _PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
export PYTHON="python${_PYTHON_VERSION}"
}

View File

@ -15,7 +15,8 @@ termux_step_make() {
}
termux_step_make_install() {
python3.10 setup.py install --prefix=$TERMUX_PREFIX --force
local _PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
python${_PYTHON_VERSION} setup.py install --prefix=$TERMUX_PREFIX --force
}
termux_step_post_massage() {

View File

@ -19,7 +19,8 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
termux_step_pre_configure() {
./autogen.sh
export CPPFLAGS="-I$TERMUX_PKG_SRCDIR/lib $CPPFLAGS"
export PYTHON="python3.10"
local _PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
export PYTHON="python${_PYTHON_VERSION}"
}
termux_step_post_configure() {

View File

@ -39,18 +39,19 @@ TERMUX_PKG_CONFFILES="share/vim/vimrc"
# vim-python:
TERMUX_PKG_CONFLICTS="vim"
_PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+="
vi_cv_path_python3_pfx=$TERMUX_PREFIX
vi_cv_var_python3_abiflags=
vi_cv_var_python3_version=3.10
vi_cv_var_python3_version=${_PYTHON_VERSION}
--enable-python3interp
--with-python3-config-dir=$TERMUX_PREFIX/lib/python3.10/config-3.10/
--with-python3-config-dir=$TERMUX_PREFIX/lib/python${_PYTHON_VERSION}/config-${_PYTHON_VERSION}/
"
TERMUX_PKG_DESCRIPTION+=" - with python support"
# Remove share/vim/vim90 which is in vim-runtime built as a subpackage of vim:
TERMUX_PKG_RM_AFTER_INSTALL+=" share/vim/vim90"
termux_step_pre_configure() {
CPPFLAGS+=" -I${TERMUX_PREFIX}/include/python3.10"
CPPFLAGS+=" -I${TERMUX_PREFIX}/include/python${_PYTHON_VERSION}"
}
termux_step_pre_configure() {

View File

@ -12,11 +12,12 @@ TERMUX_PKG_DEPENDS="gdk-pixbuf, glib, gtk3, libcairo, libcanberra, libice, libic
TERMUX_PKG_CONFLICTS="vim, vim-python, vim-runtime"
TERMUX_PKG_BUILD_IN_SRC=true
_PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
ac_cv_small_wchar_t=no
vi_cv_path_python3_pfx=$TERMUX_PREFIX
vi_cv_var_python3_abiflags=
vi_cv_var_python3_version=3.10
vi_cv_var_python3_version=${_PYTHON_VERSION}
vim_cv_getcwd_broken=no
vim_cv_memmove_handles_overlap=yes
vim_cv_stat_ignores_slash=no
@ -31,7 +32,7 @@ vim_cv_tty_group=world
--enable-python3interp
--with-features=huge
--with-lua-prefix=$TERMUX_PREFIX
--with-python3-config-dir=$TERMUX_PREFIX/lib/python3.10/config-3.10/
--with-python3-config-dir=$TERMUX_PREFIX/lib/python${_PYTHON_VERSION}/config-${_PYTHON_VERSION}/
--with-tlib=ncursesw
--with-x"