termux_step_setup_variables.sh: adding a new variable TERMUX_PYTHON_HOME

This variable allows you to shorten lines that point to python libraries.
%ci:no-build
This commit is contained in:
Maxython 2023-01-18 10:04:28 +03:00 committed by xtkoba
parent 1c0d89a5ab
commit b33d95d127
10 changed files with 11 additions and 10 deletions

View File

@ -17,7 +17,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
-DPYTHON_EXECUTABLE=python -DPYTHON_EXECUTABLE=python
-DPYTHON_INCLUDE_DIRS=$TERMUX_PREFIX/include/python${TERMUX_PYTHON_VERSION} -DPYTHON_INCLUDE_DIRS=$TERMUX_PREFIX/include/python${TERMUX_PYTHON_VERSION}
-DPYTHON_OTHER_LIBS= -DPYTHON_OTHER_LIBS=
-DNUMPY_INCLUDE_DIRS=$TERMUX_PREFIX/lib/python${TERMUX_PYTHON_VERSION}/site-packages/numpy/core/include -DNUMPY_INCLUDE_DIRS=$TERMUX_PYTHON_HOME/site-packages/numpy/core/include
-DARROW_PKG_CONFIG_INCLUDEDIR=$TERMUX_PREFIX/include -DARROW_PKG_CONFIG_INCLUDEDIR=$TERMUX_PREFIX/include
-DARROW_PKG_CONFIG_LIBDIR=$TERMUX_PREFIX/lib -DARROW_PKG_CONFIG_LIBDIR=$TERMUX_PREFIX/lib
" "

View File

@ -43,7 +43,7 @@ termux_step_pre_configure() {
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" TERMUX_PKG_EXTRA_CONFIGURE_ARGS+="
-DPYTHON_DEFAULT_EXECUTABLE=python -DPYTHON_DEFAULT_EXECUTABLE=python
-DPYTHON3_INCLUDE_PATH=$TERMUX_PREFIX/include/python${TERMUX_PYTHON_VERSION} -DPYTHON3_INCLUDE_PATH=$TERMUX_PREFIX/include/python${TERMUX_PYTHON_VERSION}
-DPYTHON3_NUMPY_INCLUDE_DIRS=$TERMUX_PREFIX/lib/python${TERMUX_PYTHON_VERSION}/site-packages/numpy/core/include -DPYTHON3_NUMPY_INCLUDE_DIRS=$TERMUX_PYTHON_HOME/site-packages/numpy/core/include
" "
} }

View File

@ -44,7 +44,7 @@ vi_cv_path_python3_pfx=$TERMUX_PREFIX
vi_cv_var_python3_abiflags= vi_cv_var_python3_abiflags=
vi_cv_var_python3_version=${TERMUX_PYTHON_VERSION} vi_cv_var_python3_version=${TERMUX_PYTHON_VERSION}
--enable-python3interp --enable-python3interp
--with-python3-config-dir=$TERMUX_PREFIX/lib/python${TERMUX_PYTHON_VERSION}/config-${TERMUX_PYTHON_VERSION}/ --with-python3-config-dir=$TERMUX_PYTHON_HOME/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:

View File

@ -12,5 +12,5 @@ TERMUX_PKG_CONFLICTS="xcbproto"
TERMUX_PKG_REPLACES="xcbproto" TERMUX_PKG_REPLACES="xcbproto"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
PYTHON=python${TERMUX_PYTHON_VERSION} PYTHON=python${TERMUX_PYTHON_VERSION}
am_cv_python_pythondir=$TERMUX_PREFIX/lib/python${TERMUX_PYTHON_VERSION}/site-packages am_cv_python_pythondir=$TERMUX_PYTHON_HOME/site-packages
" "

View File

@ -29,7 +29,7 @@ termux_step_get_dependencies_python() {
fi fi
# adding and setting values to work properly with python modules # adding and setting values to work properly with python modules
export PYTHONPATH=$TERMUX_PREFIX/lib/python${TERMUX_PYTHON_VERSION}/site-packages export PYTHONPATH=$TERMUX_PYTHON_HOME/site-packages
export PYTHON_SITE_PKG=$TERMUX_PREFIX/lib/python${TERMUX_PYTHON_VERSION}/site-packages export PYTHON_SITE_PKG=$PYTHONPATH
fi fi
} }

View File

@ -132,6 +132,7 @@ termux_step_setup_variables() {
TERMUX_PKG_PYTHON_BUILD_DEPS="" # python modules to be installed via build-pip TERMUX_PKG_PYTHON_BUILD_DEPS="" # python modules to be installed via build-pip
TERMUX_PKG_PYTHON_COMMON_DEPS="" # python modules to be installed via pip3 or build-pip TERMUX_PKG_PYTHON_COMMON_DEPS="" # python modules to be installed via pip3 or build-pip
TERMUX_PYTHON_CROSSENV_PREFIX=$TERMUX_TOPDIR/python-crossenv-prefix # python modules dependency location (only used in non-devices) TERMUX_PYTHON_CROSSENV_PREFIX=$TERMUX_TOPDIR/python-crossenv-prefix # python modules dependency location (only used in non-devices)
TERMUX_PYTHON_HOME=$TERMUX_PREFIX/lib/python${TERMUX_PYTHON_VERSION} # location of python libraries
unset CFLAGS CPPFLAGS LDFLAGS CXXFLAGS unset CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
} }

View File

@ -35,7 +35,7 @@ termux_step_pre_configure() {
$TERMUX_PKG_BUILDER_DIR/plugins-python-loader-Makefile.in.diff \ $TERMUX_PKG_BUILDER_DIR/plugins-python-loader-Makefile.in.diff \
| patch --silent -p1 | patch --silent -p1
export PYTHON_GIOVERRIDESDIR=$TERMUX_PREFIX/lib/python${TERMUX_PYTHON_VERSION}/site-packages/gi/overrides export PYTHON_GIOVERRIDESDIR=$TERMUX_PYTHON_HOME/site-packages/gi/overrides
CPPFLAGS+=" -D__USE_GNU" CPPFLAGS+=" -D__USE_GNU"
} }

View File

@ -46,7 +46,7 @@ termux_step_pre_configure() {
chmod 0700 ${_bindir}/${_cxx} chmod 0700 ${_bindir}/${_cxx}
export PATH=${_bindir}:$PATH export PATH=${_bindir}:$PATH
TERMUX_PKG_EXTRA_MAKE_ARGS+=" --target-dir=$TERMUX_PREFIX/lib/python${TERMUX_PYTHON_VERSION}/site-packages" TERMUX_PKG_EXTRA_MAKE_ARGS+=" --target-dir=$TERMUX_PYTHON_HOME/site-packages"
} }
termux_step_make() { termux_step_make() {

View File

@ -26,7 +26,7 @@ termux_step_pre_configure() {
chmod 0700 ${_bindir}/${_cxx} chmod 0700 ${_bindir}/${_cxx}
export PATH=${_bindir}:$PATH export PATH=${_bindir}:$PATH
TERMUX_PKG_EXTRA_MAKE_ARGS+=" --target-dir=$TERMUX_PREFIX/lib/python${TERMUX_PYTHON_VERSION}/site-packages" TERMUX_PKG_EXTRA_MAKE_ARGS+=" --target-dir=$TERMUX_PYTHON_HOME/site-packages"
} }
termux_step_make() { termux_step_make() {

View File

@ -33,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${TERMUX_PYTHON_VERSION}/config-${TERMUX_PYTHON_VERSION}/ --with-python3-config-dir=$TERMUX_PYTHON_HOME/config-${TERMUX_PYTHON_VERSION}/
--with-tlib=ncursesw --with-tlib=ncursesw
--with-x" --with-x"