From b12bc1d4ab56fbc28e4a3abb2eac16cc30a62598 Mon Sep 17 00:00:00 2001 From: termux-pacman-bot Date: Wed, 18 Jan 2023 14:02:51 +0000 Subject: [PATCH] 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 --- packages/libarrow-python/build.sh | 2 +- packages/opencv/build.sh | 2 +- packages/vim-python/build.sh | 2 +- packages/xcb-proto/build.sh | 2 +- x11-packages/gnumeric/build.sh | 2 +- x11-packages/pyqt5/build.sh | 2 +- x11-packages/python-pyqtwebengine/build.sh | 2 +- x11-packages/vim-gtk/build.sh | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/libarrow-python/build.sh b/packages/libarrow-python/build.sh index 1b852d8500..3099bb2748 100644 --- a/packages/libarrow-python/build.sh +++ b/packages/libarrow-python/build.sh @@ -17,7 +17,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DPYTHON_EXECUTABLE=python -DPYTHON_INCLUDE_DIRS=$TERMUX_PREFIX/include/python${TERMUX_PYTHON_VERSION} -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_LIBDIR=$TERMUX_PREFIX/lib " diff --git a/packages/opencv/build.sh b/packages/opencv/build.sh index dc76fe8744..01b4c33892 100644 --- a/packages/opencv/build.sh +++ b/packages/opencv/build.sh @@ -43,7 +43,7 @@ termux_step_pre_configure() { TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DPYTHON_DEFAULT_EXECUTABLE=python -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 " } diff --git a/packages/vim-python/build.sh b/packages/vim-python/build.sh index 017e42ef65..48948f7a08 100644 --- a/packages/vim-python/build.sh +++ b/packages/vim-python/build.sh @@ -44,7 +44,7 @@ vi_cv_path_python3_pfx=$TERMUX_PREFIX vi_cv_var_python3_abiflags= vi_cv_var_python3_version=${TERMUX_PYTHON_VERSION} --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" # Remove share/vim/vim90 which is in vim-runtime built as a subpackage of vim: diff --git a/packages/xcb-proto/build.sh b/packages/xcb-proto/build.sh index 53e48f6689..b5415de192 100644 --- a/packages/xcb-proto/build.sh +++ b/packages/xcb-proto/build.sh @@ -12,5 +12,5 @@ TERMUX_PKG_CONFLICTS="xcbproto" TERMUX_PKG_REPLACES="xcbproto" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" 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 " diff --git a/x11-packages/gnumeric/build.sh b/x11-packages/gnumeric/build.sh index 13c041d4a4..79fb8c8e5e 100644 --- a/x11-packages/gnumeric/build.sh +++ b/x11-packages/gnumeric/build.sh @@ -35,7 +35,7 @@ termux_step_pre_configure() { $TERMUX_PKG_BUILDER_DIR/plugins-python-loader-Makefile.in.diff \ | 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" } diff --git a/x11-packages/pyqt5/build.sh b/x11-packages/pyqt5/build.sh index efff1ae6aa..7910915bac 100644 --- a/x11-packages/pyqt5/build.sh +++ b/x11-packages/pyqt5/build.sh @@ -46,7 +46,7 @@ termux_step_pre_configure() { chmod 0700 ${_bindir}/${_cxx} 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() { diff --git a/x11-packages/python-pyqtwebengine/build.sh b/x11-packages/python-pyqtwebengine/build.sh index 7e64ab24e8..56acd3da6e 100644 --- a/x11-packages/python-pyqtwebengine/build.sh +++ b/x11-packages/python-pyqtwebengine/build.sh @@ -26,7 +26,7 @@ termux_step_pre_configure() { chmod 0700 ${_bindir}/${_cxx} 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() { diff --git a/x11-packages/vim-gtk/build.sh b/x11-packages/vim-gtk/build.sh index e377dedcee..a794b55843 100644 --- a/x11-packages/vim-gtk/build.sh +++ b/x11-packages/vim-gtk/build.sh @@ -33,7 +33,7 @@ vim_cv_tty_group=world --enable-python3interp --with-features=huge --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-x"