From ccfe6cdfc9f374559720ccf690dcecee063c62d4 Mon Sep 17 00:00:00 2001 From: Robert Kirkman Date: Mon, 17 Nov 2025 14:43:37 -0600 Subject: [PATCH] tree-wide: apply relative `CMAKE_INSTALL_LIBDIR` and `CMAKE_INSTALL_INCLUDEDIR` to packages that otherwise generate invalid `.cmake` and `.pc` files - like - https://github.com/termux/termux-packages/pull/25694 - https://github.com/termux/termux-packages/pull/26831 - https://github.com/termux/termux-packages/pull/27230 - Before: ``` ~ $ grep -rnI $PREFIX -e /$PREFIX/include -e /$PREFIX/lib /data/data/com.termux/files/usr/bin/taglib-config:24: includedir=${prefix}//data/data/com.termux/files/usr/include /data/data/com.termux/files/usr/bin/gdal-config:10:CONFIG_PLUGINDIR="/data/data/com.termux/files/usr//data/data/com.termux/files/usr/lib/gdalplugins" /data/data/com.termux/files/usr/bin/xslt-config:6:includedir=${prefix}//data/data/com.termux/files/usr/include /data/data/com.termux/files/usr/bin/xslt-config:7:libdir=${prefix}//data/data/com.termux/files/usr/lib /data/data/com.termux/files/usr/share/pkgconfig/tree-sitter-c.pc:2:libdir=${prefix}//data/data/com.termux/files/usr/lib /data/data/com.termux/files/usr/share/pkgconfig/tree-sitter-c.pc:3:includedir=${prefix}//data/data/com.termux/files/usr/include /data/data/com.termux/files/usr/share/pkgconfig/tree-sitter-lua.pc:2:libdir=${prefix}//data/data/com.termux/files/usr/lib /data/data/com.termux/files/usr/share/pkgconfig/tree-sitter-lua.pc:3:includedir=${prefix}//data/data/com.termux/files/usr/include /data/data/com.termux/files/usr/share/pkgconfig/tree-sitter-query.pc:2:libdir=${prefix}//data/data/com.termux/files/usr/lib /data/data/com.termux/files/usr/share/pkgconfig/tree-sitter-query.pc:3:includedir=${prefix}//data/data/com.termux/files/usr/include /data/data/com.termux/files/usr/share/pkgconfig/swipl.pc:3:libdir=/data/data/com.termux/files/usr//data/data/com.termux/files/usr/lib /data/data/com.termux/files/usr/lib/pkgconfig/SPIRV-Tools.pc:3:libdir=${prefix}//data/data/com.termux/files/usr/lib /data/data/com.termux/files/usr/lib/pkgconfig/SPIRV-Tools.pc:4:includedir=${prefix}//data/data/com.termux/files/usr/include /data/data/com.termux/files/usr/lib/pkgconfig/libcares.pc:11:libdir=${prefix}//data/data/com.termux/files/usr/lib /data/data/com.termux/files/usr/lib/pkgconfig/libcares.pc:12:includedir=${prefix}//data/data/com.termux/files/usr/include /data/data/com.termux/files/usr/lib/pkgconfig/shaderc.pc:3:libdir=${prefix}//data/data/com.termux/files/usr/lib /data/data/com.termux/files/usr/lib/pkgconfig/shaderc.pc:4:includedir=${prefix}//data/data/com.termux/files/usr/include /data/data/com.termux/files/usr/lib/pkgconfig/blosc.pc:5:includedir=${prefix}//data/data/com.termux/files/usr/include /data/data/com.termux/files/usr/lib/pkgconfig/toxcore.pc:2:libdir=${prefix}//data/data/com.termux/files/usr/lib /data/data/com.termux/files/usr/lib/pkgconfig/toxcore.pc:3:includedir=${prefix}//data/data/com.termux/files/usr/include /data/data/com.termux/files/usr/lib/pkgconfig/id3tag.pc:3:libdir=${prefix}//data/data/com.termux/files/usr/lib /data/data/com.termux/files/usr/lib/pkgconfig/libxslt.pc:3:libdir=${prefix}//data/data/com.termux/files/usr/lib /data/data/com.termux/files/usr/lib/pkgconfig/libxslt.pc:4:includedir=${prefix}//data/data/com.termux/files/usr/include /data/data/com.termux/files/usr/lib/pkgconfig/SPIRV-Tools-shared.pc:3:libdir=${prefix}//data/data/com.termux/files/usr/lib /data/data/com.termux/files/usr/lib/pkgconfig/SPIRV-Tools-shared.pc:4:includedir=${prefix}//data/data/com.termux/files/usr/include /data/data/com.termux/files/usr/lib/pkgconfig/tree-sitter-markdown-inline.pc:2:libdir=${prefix}//data/data/com.termux/files/usr/lib /data/data/com.termux/files/usr/lib/pkgconfig/tree-sitter-markdown-inline.pc:3:includedir=${prefix}//data/data/com.termux/files/usr/include /data/data/com.termux/files/usr/lib/pkgconfig/shaderc_combined.pc:3:libdir=${prefix}//data/data/com.termux/files/usr/lib /data/data/com.termux/files/usr/lib/pkgconfig/shaderc_combined.pc:4:includedir=${prefix}//data/data/com.termux/files/usr/include /data/data/com.termux/files/usr/lib/pkgconfig/libtorrent-rasterbar.pc:8:Cflags: -fexceptions -pthread -I/data/data/com.termux/files/usr//data/data/com.termux/files/usr/include -DTORRENT_LINKING_SHARED -DBOOST_ASIO_ENABLE_CANCELIO -DBOOST_ASIO_NO_DEPRECATED -DTORRENT_USE_OPENSSL -DTORRENT_USE_LIBCRYPTO -DTORRENT_SSL_PEERS -DOPENSSL_NO_SSL2 /data/data/com.termux/files/usr/lib/pkgconfig/muparser.pc:3:libdir=${prefix}//data/data/com.termux/files/usr/lib /data/data/com.termux/files/usr/lib/pkgconfig/muparser.pc:4:includedir=${prefix}//data/data/com.termux/files/usr/include /data/data/com.termux/files/usr/lib/pkgconfig/haisrt.pc:4:includedir=${prefix}//data/data/com.termux/files/usr/include /data/data/com.termux/files/usr/lib/pkgconfig/shaderc_static.pc:3:libdir=${prefix}//data/data/com.termux/files/usr/lib /data/data/com.termux/files/usr/lib/pkgconfig/shaderc_static.pc:4:includedir=${prefix}//data/data/com.termux/files/usr/include /data/data/com.termux/files/usr/lib/pkgconfig/aom.pc:4:includedir=${prefix}//data/data/com.termux/files/usr/include /data/data/com.termux/files/usr/lib/pkgconfig/srt.pc:4:includedir=${prefix}//data/data/com.termux/files/usr/include /data/data/com.termux/files/usr/lib/pkgconfig/openxr.pc:7:libdir=${exec_prefix}//data/data/com.termux/files/usr/lib /data/data/com.termux/files/usr/lib/pkgconfig/libobjc.pc:3:libdir=${exec_prefix}//data/data/com.termux/files/usr/lib /data/data/com.termux/files/usr/lib/pkgconfig/openblas.pc:5:includedir=/data/data/com.termux/files/usr//data/data/com.termux/files/usr/include/openblas /data/data/com.termux/files/usr/lib/pkgconfig/libpano13.pc:14:libdir=/data/data/com.termux/files/usr//data/data/com.termux/files/usr/lib /data/data/com.termux/files/usr/lib/pkgconfig/tree-sitter-markdown.pc:2:libdir=${prefix}//data/data/com.termux/files/usr/lib /data/data/com.termux/files/usr/lib/pkgconfig/tree-sitter-markdown.pc:3:includedir=${prefix}//data/data/com.termux/files/usr/include /data/data/com.termux/files/usr/lib/pkgconfig/libchromaprint.pc:3:libdir=${prefix}//data/data/com.termux/files/usr/lib /data/data/com.termux/files/usr/lib/pkgconfig/libchromaprint.pc:4:includedir=${prefix}//data/data/com.termux/files/usr/include /data/data/com.termux/files/usr/lib/pkgconfig/libexslt.pc:3:libdir=${prefix}//data/data/com.termux/files/usr/lib /data/data/com.termux/files/usr/lib/pkgconfig/libexslt.pc:4:includedir=${prefix}//data/data/com.termux/files/usr/include /data/data/com.termux/files/usr/lib/cmake/libxslt-1.1.43/libxslt-config.cmake:40:set(LIBXSLT_INCLUDE_DIR "${PACKAGE_PREFIX_DIR}//data/data/com.termux/files/usr/include") /data/data/com.termux/files/usr/lib/cmake/libxslt-1.1.43/libxslt-config.cmake:41:set(LIBXSLT_LIBRARY_DIR "${PACKAGE_PREFIX_DIR}//data/data/com.termux/files/usr/lib") /data/data/com.termux/files/usr/lib/cmake/libxslt-1.1.43/libxslt-config.cmake:42:set(LIBXSLT_EXSLT_INCLUDE_DIR "${PACKAGE_PREFIX_DIR}//data/data/com.termux/files/usr/include") /data/data/com.termux/files/usr/lib/cmake/libxslt-1.1.43/libxslt-config.cmake:43:set(LIBXSLT_EXSLT_LIBRARY_DIR "${PACKAGE_PREFIX_DIR}//data/data/com.termux/files/usr/lib") /data/data/com.termux/files/usr/lib/cmake/libxslt-1.1.43/libxslt-export.cmake:56: INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}//data/data/com.termux/files/usr/include" /data/data/com.termux/files/usr/lib/cmake/libxslt-1.1.43/libxslt-export.cmake:64: INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}//data/data/com.termux/files/usr/include" /data/data/com.termux/files/usr/lib/python3.12/site-packages/scipy/__config__.py:86: "include directory": r"/data/data/com.termux/files/usr//data/data/com.termux/files/usr/include/openblas", /data/data/com.termux/files/usr/lib/python3.12/site-packages/scipy/__config__.py:96: "include directory": r"/data/data/com.termux/files/usr//data/data/com.termux/files/usr/include/openblas", /data/data/com.termux/files/usr/lib/python3.12/site-packages/numpy/__config__.py:79: "include directory": r"/data/data/com.termux/files/usr//data/data/com.termux/files/usr/include/openblas", /data/data/com.termux/files/usr/lib/python3.12/site-packages/numpy/__config__.py:89: "include directory": r"/data/data/com.termux/files/usr//data/data/com.termux/files/usr/include/openblas", ~ $ ``` - After: ``` ~ $ grep -rnI $PREFIX -e /$PREFIX/include -e /$PREFIX/lib ~ $ ``` - Fix prefix pollutiuon build failure `shaderc`->`openxr` - Remove only remaining instance of obsolete variable `TERMUX_PKG_INCLUDE_IN_DEVPACKAGE` from `taglib` - Rebuild `python-numpy` and `python-scipy` because they got polluted by invalid paths from the `openblas.pc` --- packages/c-ares/build.sh | 6 +++++- packages/c-toxcore/build.sh | 4 +++- packages/gdal/build.sh | 3 +++ packages/libaom/build.sh | 4 +++- packages/libblosc/build.sh | 4 +++- packages/libchromaprint/build.sh | 3 +++ packages/libid3tag/build.sh | 6 +++++- packages/libmuparser/build.sh | 6 +++++- packages/libobjc2/build.sh | 3 +++ packages/libopenblas/build.sh | 8 +++++--- packages/libpano13/build.sh | 3 +++ packages/libsrt/build.sh | 4 +++- packages/libtorrent-rasterbar/build.sh | 4 +++- packages/libxslt/build.sh | 6 +++++- packages/openxr/build.sh | 3 +++ packages/openxr/no-glslc.patch | 20 ++++++++++++++++++++ packages/python-numpy/build.sh | 2 +- packages/python-scipy/build.sh | 1 + packages/shaderc/build.sh | 4 +++- packages/spirv-tools/build.sh | 3 +++ packages/swi-prolog/build.sh | 3 +++ packages/taglib/build.sh | 9 +++++---- packages/tree-sitter-c/build.sh | 6 +++++- packages/tree-sitter-lua/build.sh | 6 +++++- packages/tree-sitter-markdown/build.sh | 3 +++ packages/tree-sitter-query/build.sh | 5 +++++ 26 files changed, 109 insertions(+), 20 deletions(-) create mode 100644 packages/openxr/no-glslc.patch diff --git a/packages/c-ares/build.sh b/packages/c-ares/build.sh index 00b6fd17be3d75..f5f757ee677cd5 100644 --- a/packages/c-ares/build.sh +++ b/packages/c-ares/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Library for asynchronous DNS requests (including name re TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="1.34.5" -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://github.com/c-ares/c-ares/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=dcd919635f01b7c8c9c2f5fb38063cd86500f7c6d4d32ecf4deff5e3497fb157 TERMUX_PKG_AUTO_UPDATE=true @@ -14,6 +14,10 @@ TERMUX_PKG_REPLACES="c-ares-dev" # Build with cmake to install cmake/c-ares/*.cmake files: TERMUX_PKG_FORCE_CMAKE=true TERMUX_PKG_RM_AFTER_INSTALL="bin/" +TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +-DCMAKE_INSTALL_LIBDIR=$TERMUX__PREFIX__LIB_SUBDIR +-DCMAKE_INSTALL_INCLUDEDIR=$TERMUX__PREFIX__INCLUDE_SUBDIR +" termux_step_post_get_source() { # Do not forget to bump revision of reverse dependencies and rebuild them diff --git a/packages/c-toxcore/build.sh b/packages/c-toxcore/build.sh index 2c7855775b094f..4a30371f79e271 100644 --- a/packages/c-toxcore/build.sh +++ b/packages/c-toxcore/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_MAINTAINER="@termux" _COMMIT=0f12f384c8cf62310b9cff6c31e94af7126b7478 _COMMIT_DATE=20250105 TERMUX_PKG_VERSION=0.2.20-p${_COMMIT_DATE} -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=git+https://github.com/TokTok/c-toxcore TERMUX_PKG_SHA256=26fb56c1818f9aed9e507ed2ed8f2e6e6e5d05f7a264eb8856be5b6b887c656f TERMUX_PKG_GIT_BRANCH=master @@ -15,6 +15,8 @@ TERMUX_PKG_DEPENDS="libsodium, libopus, libvpx" TERMUX_PKG_BREAKS="c-toxcore-dev" TERMUX_PKG_REPLACES="c-toxcore-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +-DCMAKE_INSTALL_LIBDIR=$TERMUX__PREFIX__LIB_SUBDIR +-DCMAKE_INSTALL_INCLUDEDIR=$TERMUX__PREFIX__INCLUDE_SUBDIR -DBOOTSTRAP_DAEMON=off -DDHT_BOOTSTRAP=off " diff --git a/packages/gdal/build.sh b/packages/gdal/build.sh index 5ccb06c5e11b77..7c0d26654559d4 100644 --- a/packages/gdal/build.sh +++ b/packages/gdal/build.sh @@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_LICENSE_FILE="LICENSE.TXT" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="3.12.0" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://download.osgeo.org/gdal/${TERMUX_PKG_VERSION}/gdal-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=428c19fff818bbb4136766cfee86fae2eebd3620806aa40af21844f4f0b2dbcf TERMUX_PKG_AUTO_UPDATE=true @@ -14,6 +15,8 @@ TERMUX_PKG_REPLACES="gdal-dev" TERMUX_PKG_GROUPS="science" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +-DCMAKE_INSTALL_LIBDIR=$TERMUX__PREFIX__LIB_SUBDIR +-DCMAKE_INSTALL_INCLUDEDIR=$TERMUX__PREFIX__INCLUDE_SUBDIR -DGDAL_USE_JXL=ON -DGDAL_USE_TIFF_INTERNAL=ON -DGDAL_USE_GEOTIFF_INTERNAL=ON diff --git a/packages/libaom/build.sh b/packages/libaom/build.sh index 1919892379c0ee..efe16019921d96 100644 --- a/packages/libaom/build.sh +++ b/packages/libaom/build.sh @@ -4,12 +4,14 @@ TERMUX_PKG_LICENSE="BSD 2-Clause" TERMUX_PKG_LICENSE_FILE="LICENSE, PATENTS" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="3.13.1" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://storage.googleapis.com/aom-releases/libaom-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=19e45a5a7192d690565229983dad900e76b513a02306c12053fb9a262cbeca7d TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DBUILD_SHARED_LIBS=ON --DCMAKE_INSTALL_LIBDIR=lib +-DCMAKE_INSTALL_LIBDIR=$TERMUX__PREFIX__LIB_SUBDIR +-DCMAKE_INSTALL_INCLUDEDIR=$TERMUX__PREFIX__INCLUDE_SUBDIR " termux_step_pre_configure() { diff --git a/packages/libblosc/build.sh b/packages/libblosc/build.sh index a8d09ab9501662..3814e6e2959f11 100644 --- a/packages/libblosc/build.sh +++ b/packages/libblosc/build.sh @@ -11,12 +11,14 @@ LICENSES/ZLIB-NG.txt LICENSES/ZLIB.txt" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="1.21.6" -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://github.com/Blosc/c-blosc/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=9fcd60301aae28f97f1301b735f966cc19e7c49b6b4321b839b4579a0c156f38 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_DEPENDS="liblz4, libsnappy, zlib, zstd" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +-DCMAKE_INSTALL_LIBDIR=$TERMUX__PREFIX__LIB_SUBDIR +-DCMAKE_INSTALL_INCLUDEDIR=$TERMUX__PREFIX__INCLUDE_SUBDIR -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DDEACTIVATE_LZ4=OFF -DDEACTIVATE_SNAPPY=OFF diff --git a/packages/libchromaprint/build.sh b/packages/libchromaprint/build.sh index 91c4c40e989df5..e6323f380db2a2 100644 --- a/packages/libchromaprint/build.sh +++ b/packages/libchromaprint/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="C library for generating audio fingerprints used by Acou TERMUX_PKG_LICENSE="LGPL-2.1, MIT" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.6.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/acoustid/chromaprint/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=65bfce4a35b2e673dbcda917b6aa577e2f145cf805243d19e6a50fea2a520c2a TERMUX_PKG_DEPENDS="fftw, libc++" @@ -11,6 +12,8 @@ TERMUX_PKG_BREAKS="chromaprint (<< 1.5.1-p20250625)" TERMUX_PKG_REPLACES="chromaprint (<< 1.5.1-p20250625)" TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +-DCMAKE_INSTALL_LIBDIR=$TERMUX__PREFIX__LIB_SUBDIR +-DCMAKE_INSTALL_INCLUDEDIR=$TERMUX__PREFIX__INCLUDE_SUBDIR -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DFFT_LIB=fftw3 diff --git a/packages/libid3tag/build.sh b/packages/libid3tag/build.sh index c57df886b723fa..510a40cc6c05a1 100644 --- a/packages/libid3tag/build.sh +++ b/packages/libid3tag/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="MAD ID3 tag manipulation library" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="0.16.3" -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://codeberg.org/tenacityteam/libid3tag/archive/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=0561009778513a95d91dac33cee8418d6622f710450a7cb56a74636d53b588cb TERMUX_PKG_AUTO_UPDATE=true @@ -11,3 +11,7 @@ TERMUX_PKG_UPDATE_TAG_TYPE="newest-tag" TERMUX_PKG_DEPENDS="zlib" TERMUX_PKG_BREAKS="libid3tag-dev" TERMUX_PKG_REPLACES="libid3tag-dev" +TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +-DCMAKE_INSTALL_LIBDIR=$TERMUX__PREFIX__LIB_SUBDIR +-DCMAKE_INSTALL_INCLUDEDIR=$TERMUX__PREFIX__INCLUDE_SUBDIR +" diff --git a/packages/libmuparser/build.sh b/packages/libmuparser/build.sh index b92a8f21758c9f..cc365ba95ffdd5 100644 --- a/packages/libmuparser/build.sh +++ b/packages/libmuparser/build.sh @@ -4,12 +4,16 @@ TERMUX_PKG_GROUPS="science" TERMUX_PKG_LICENSE="BSD 2-Clause" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="2.3.5" -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL="https://github.com/beltoforion/muparser/archive/refs/tags/v$TERMUX_PKG_VERSION.tar.gz" TERMUX_PKG_SHA256=20b43cc68c655665db83711906f01b20c51909368973116dfc8d7b3c4ddb5dd4 TERMUX_PKG_DEPENDS="libc++" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_AUTO_UPDATE=true +TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +-DCMAKE_INSTALL_LIBDIR=$TERMUX__PREFIX__LIB_SUBDIR +-DCMAKE_INSTALL_INCLUDEDIR=$TERMUX__PREFIX__INCLUDE_SUBDIR +" termux_step_pre_configure() { LDFLAGS+=" -fopenmp -static-openmp" diff --git a/packages/libobjc2/build.sh b/packages/libobjc2/build.sh index 7aacd270275277..b7408ef4fa5f20 100644 --- a/packages/libobjc2/build.sh +++ b/packages/libobjc2/build.sh @@ -3,11 +3,14 @@ TERMUX_PKG_DESCRIPTION="The GNUstep Objective-C runtime" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="2.3" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL="https://github.com/gnustep/libobjc2/archive/v${TERMUX_PKG_VERSION}.tar.gz" TERMUX_PKG_SHA256=5ead2276b42a534ac40437ce53b2231320b985539dc325453d93874be8d92869 TERMUX_PKG_DEPENDS="libc++" TERMUX_PKG_BUILD_DEPENDS="robin-map" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +-DCMAKE_INSTALL_LIBDIR=$TERMUX__PREFIX__LIB_SUBDIR +-DCMAKE_INSTALL_INCLUDEDIR=$TERMUX__PREFIX__INCLUDE_SUBDIR -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DENABLE_OBJCXX=OFF -DGNUSTEP_CONFIG=OFF diff --git a/packages/libopenblas/build.sh b/packages/libopenblas/build.sh index adac5f99e8a852..cff45c914037cd 100644 --- a/packages/libopenblas/build.sh +++ b/packages/libopenblas/build.sh @@ -4,17 +4,19 @@ TERMUX_PKG_GROUPS="science" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="0.3.30" -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL="https://github.com/xianyi/OpenBLAS/archive/refs/tags/v$TERMUX_PKG_VERSION.tar.gz" TERMUX_PKG_SHA256=27342cff518646afb4c2b976d809102e368957974c250a25ccc965e53063c95d TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_FORCE_CMAKE=true -TERMUX_PKG_EXTRA_CONFIGURE_ARGS=' +TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +-DCMAKE_INSTALL_LIBDIR=$TERMUX__PREFIX__LIB_SUBDIR +-DCMAKE_INSTALL_INCLUDEDIR=$TERMUX__PREFIX__INCLUDE_SUBDIR -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=ON -DC_LAPACK=ON -' +" termux_step_post_get_source() { # Do not forget to bump revision of reverse dependencies and rebuild them diff --git a/packages/libpano13/build.sh b/packages/libpano13/build.sh index 8e9f3931fb4ac1..c4e89b55a285e8 100644 --- a/packages/libpano13/build.sh +++ b/packages/libpano13/build.sh @@ -3,10 +3,13 @@ TERMUX_PKG_DESCRIPTION="Part of the Panorama Tools by Helmut Dersch" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="2.9.23" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/panotools/libpano13-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=e7c076d37a14c39434962115e47ddbe18452ca3de5ce40e2aaefa7cf5815ea28 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_DEPENDS="libjpeg-turbo, libpng, libtiff, zlib" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +-DCMAKE_INSTALL_LIBDIR=$TERMUX__PREFIX__LIB_SUBDIR +-DCMAKE_INSTALL_INCLUDEDIR=$TERMUX__PREFIX__INCLUDE_SUBDIR -DCMAKE_POLICY_VERSION_MINIMUM=3.5 " diff --git a/packages/libsrt/build.sh b/packages/libsrt/build.sh index 32832b91c31332..6c13a1d6c5db1d 100644 --- a/packages/libsrt/build.sh +++ b/packages/libsrt/build.sh @@ -3,13 +3,15 @@ TERMUX_PKG_DESCRIPTION="Secure Reliable Transport (SRT) Protocol" TERMUX_PKG_LICENSE="MPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="1.5.4" -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://github.com/Haivision/srt/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=d0a8b600fe1b4eaaf6277530e3cfc8f15b8ce4035f16af4a5eb5d4b123640cdd TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_DEPENDS="libc++, openssl" TERMUX_PKG_FORCE_CMAKE=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +-DCMAKE_INSTALL_LIBDIR=$TERMUX__PREFIX__LIB_SUBDIR +-DCMAKE_INSTALL_INCLUDEDIR=$TERMUX__PREFIX__INCLUDE_SUBDIR -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DUSE_GNUTLS=OFF -DENABLE_STATIC=OFF diff --git a/packages/libtorrent-rasterbar/build.sh b/packages/libtorrent-rasterbar/build.sh index 79032d53ed3d32..bb06167215f2e9 100644 --- a/packages/libtorrent-rasterbar/build.sh +++ b/packages/libtorrent-rasterbar/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="A feature complete C++ bittorrent implementation focusin TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="2.0.11" -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://github.com/arvidn/libtorrent/releases/download/v${TERMUX_PKG_VERSION}/libtorrent-rasterbar-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=f0db58580f4f29ade6cc40fa4ba80e2c9a70c90265cd77332d3cdec37ecf1e6d TERMUX_PKG_AUTO_UPDATE=true @@ -11,6 +11,8 @@ TERMUX_PKG_DEPENDS="boost, libc++, openssl, python" TERMUX_PKG_BUILD_DEPENDS="boost-headers" TERMUX_PKG_PYTHON_COMMON_DEPS="wheel" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +-DCMAKE_INSTALL_LIBDIR=$TERMUX__PREFIX__LIB_SUBDIR +-DCMAKE_INSTALL_INCLUDEDIR=$TERMUX__PREFIX__INCLUDE_SUBDIR -Dboost-python-module-name=python -Dpython-bindings=ON " diff --git a/packages/libxslt/build.sh b/packages/libxslt/build.sh index b09aece4a85f70..ef2b42c6f9ae1a 100644 --- a/packages/libxslt/build.sh +++ b/packages/libxslt/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="XSLT processing library" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="1.1.43" -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL="https://gitlab.gnome.org/GNOME/libxslt/-/archive/v${TERMUX_PKG_VERSION}/libxslt-v${TERMUX_PKG_VERSION}.tar.gz" TERMUX_PKG_SHA256=47747c86ce5acd2b5cdc276e37a755c8fe93bcfcd0302f76303d93b7cca66867 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DLIBXSLT_WITH_PYTHON=no" @@ -11,6 +11,10 @@ TERMUX_PKG_DEPENDS="libgcrypt, libgpg-error, libxml2, libandroid-glob" TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_BREAKS="libxslt-dev" TERMUX_PKG_REPLACES="libxslt-dev" +TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +-DCMAKE_INSTALL_LIBDIR=$TERMUX__PREFIX__LIB_SUBDIR +-DCMAKE_INSTALL_INCLUDEDIR=$TERMUX__PREFIX__INCLUDE_SUBDIR +" termux_step_pre_configure() { LDFLAGS+=" -landroid-glob" diff --git a/packages/openxr/build.sh b/packages/openxr/build.sh index 8aebbe49cb4394..8aab105bc8105a 100644 --- a/packages/openxr/build.sh +++ b/packages/openxr/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Open standard that provides a common set of APIs for dev TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="1.1.53" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL="https://github.com/KhronosGroup/OpenXR-SDK-Source/releases/download/release-$TERMUX_PKG_VERSION/OpenXR-SDK-Source-release-$TERMUX_PKG_VERSION.tar.gz" TERMUX_PKG_SHA256=1bf766990ff47dfb9b32df201777f666a6399aaab4a249e43b7ad676ad240a3c # configuration error if jsoncpp and jsoncpp-static are not both installed simultaneously @@ -11,6 +12,8 @@ TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_UPDATE_VERSION_REGEXP="\d+.\d+.\d+" TERMUX_PKG_BUILD_DEPENDS="jsoncpp-static, vulkan-headers" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +-DCMAKE_INSTALL_LIBDIR=$TERMUX__PREFIX__LIB_SUBDIR +-DCMAKE_INSTALL_INCLUDEDIR=$TERMUX__PREFIX__INCLUDE_SUBDIR -DCMAKE_SYSTEM_NAME=Linux -DPRESENTATION_BACKEND=xlib -DDYNAMIC_LOADER=ON diff --git a/packages/openxr/no-glslc.patch b/packages/openxr/no-glslc.patch new file mode 100644 index 00000000000000..da9e1e827976fd --- /dev/null +++ b/packages/openxr/no-glslc.patch @@ -0,0 +1,20 @@ +Prevents error: +/bin/sh: 1: /data/data/com.termux/files/usr/bin/glslc: Exec format error +during cross-compilation if shaderc was built in the same termux-package-builder container +before building openxr. +glslc is optional for building openxr, since normally it builds successfully without it. + +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -341,11 +341,6 @@ else() + ${VULKAN_SDK}/* + ) + endif() +- find_program( +- GLSL_COMPILER glslc +- PATHS ${glslc_folders} +- HINTS "${Vulkan_GLSLC_EXECUTABLE}" +- ) + endif() + find_program( + GLSLANG_VALIDATOR glslangValidator diff --git a/packages/python-numpy/build.sh b/packages/python-numpy/build.sh index 8735e41ab76d7c..94e8c6d6baf913 100644 --- a/packages/python-numpy/build.sh +++ b/packages/python-numpy/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="@termux" # Revbump revdeps after updating TERMUX_PKG_VERSION="2.2.5" -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=git+https://github.com/numpy/numpy TERMUX_PKG_DEPENDS="libc++, libopenblas, python" TERMUX_PKG_AUTO_UPDATE=false diff --git a/packages/python-scipy/build.sh b/packages/python-scipy/build.sh index ddb48cea985284..5d2c9da02e31c1 100644 --- a/packages/python-scipy/build.sh +++ b/packages/python-scipy/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Fundamental algorithms for scientific computing in Pytho TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="1.16.3" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=git+https://github.com/scipy/scipy TERMUX_PKG_DEPENDS="libc++, libopenblas, python, python-numpy" TERMUX_PKG_BUILD_DEPENDS="python-numpy-static" diff --git a/packages/shaderc/build.sh b/packages/shaderc/build.sh index fc74ad33e9919b..38e0dd48e47854 100644 --- a/packages/shaderc/build.sh +++ b/packages/shaderc/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Collection of tools, libraries, and tests for Vulkan sha TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="2025.4" -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://github.com/google/shaderc/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=8a89fb6612ace8954470aae004623374a8fc8b7a34a4277bee5527173b064faf TERMUX_PKG_DEPENDS="glslang, spirv-tools, libc++" @@ -12,6 +12,8 @@ TERMUX_PKG_NO_STATICSPLIT=true TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_UPDATE_TAG_TYPE="newest-tag" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +-DCMAKE_INSTALL_LIBDIR=$TERMUX__PREFIX__LIB_SUBDIR +-DCMAKE_INSTALL_INCLUDEDIR=$TERMUX__PREFIX__INCLUDE_SUBDIR -DSHADERC_SKIP_TESTS=ON -Dglslang_SOURCE_DIR=$TERMUX_PREFIX/include/glslang " diff --git a/packages/spirv-tools/build.sh b/packages/spirv-tools/build.sh index c708922afe63a7..61f90f330d5591 100644 --- a/packages/spirv-tools/build.sh +++ b/packages/spirv-tools/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="SPIR-V Tools" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="1.4.328.1" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/vulkan-sdk-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=d00dc47df7163c2bacd70f090441e8fad96234f0e3b96c54ee9091a49e627adb TERMUX_PKG_DEPENDS="libc++" @@ -11,6 +12,8 @@ TERMUX_PKG_NO_STATICSPLIT=true TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_UPDATE_VERSION_REGEXP="\d+\.\d+\.\d+\.\d+" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +-DCMAKE_INSTALL_LIBDIR=$TERMUX__PREFIX__LIB_SUBDIR +-DCMAKE_INSTALL_INCLUDEDIR=$TERMUX__PREFIX__INCLUDE_SUBDIR -DSPIRV-Headers_SOURCE_DIR=${TERMUX_PREFIX} -DSPIRV_WERROR=OFF " diff --git a/packages/swi-prolog/build.sh b/packages/swi-prolog/build.sh index d743454737cd21..900aae5dd6fc21 100644 --- a/packages/swi-prolog/build.sh +++ b/packages/swi-prolog/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Most popular and complete prolog implementation" TERMUX_PKG_LICENSE="BSD 2-Clause" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="9.3.34" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://www.swi-prolog.org/download/devel/src/swipl-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=89d7c860dcf1261f0a4ae990faaa038168225fe11708252a9d09d45aac8ab583 TERMUX_PKG_DEPENDS="libandroid-execinfo, libarchive, libcrypt, libdb, libedit, libgmp, libyaml, ncurses, openssl, ossp-uuid, pcre2, python, unixodbc, zlib" @@ -12,6 +13,8 @@ TERMUX_PKG_AUTO_UPDATE=true # configure arguments that should only be applied to the target build, and never the hostbuild TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +-DCMAKE_INSTALL_LIBDIR=$TERMUX__PREFIX__LIB_SUBDIR +-DCMAKE_INSTALL_INCLUDEDIR=$TERMUX__PREFIX__INCLUDE_SUBDIR -DHAVE_WEAK_ATTRIBUTE_EXITCODE=0 -DSWIPL_NATIVE_FRIEND=${TERMUX_PKG_HOSTBUILD_DIR} -DPOSIX_SHELL=${TERMUX_PREFIX}/bin/sh diff --git a/packages/taglib/build.sh b/packages/taglib/build.sh index a4121969b8cdb0..22dd355b545ce1 100644 --- a/packages/taglib/build.sh +++ b/packages/taglib/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_LICENSE="custom" TERMUX_PKG_LICENSE_FILE="COPYING.LGPL, COPYING.MPL" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="2.1.1" -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://github.com/taglib/taglib/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=bd57924496a272322d6f9252502da4e620b6ab9777992e8934779ebd64babd6e TERMUX_PKG_AUTO_UPDATE=true @@ -13,13 +13,14 @@ TERMUX_PKG_DEPENDS="libc++, zlib, utf8cpp" TERMUX_PKG_BUILD_DEPENDS="boost, boost-headers" TERMUX_PKG_BREAKS="taglib-dev" TERMUX_PKG_REPLACES="taglib-dev" -TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="bin/taglib-config" - TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +-DCMAKE_INSTALL_LIBDIR=$TERMUX__PREFIX__LIB_SUBDIR +-DCMAKE_INSTALL_INCLUDEDIR=$TERMUX__PREFIX__INCLUDE_SUBDIR -DBUILD_SHARED_LIBS=ON -DWITH_MP4=ON -DWITH_ASF=ON --DWITH_DSF=ON" +-DWITH_DSF=ON +" termux_step_post_get_source() { # Do not forget to bump revision of reverse dependencies and rebuild them diff --git a/packages/tree-sitter-c/build.sh b/packages/tree-sitter-c/build.sh index 72908016662982..5b81e5bcf60b69 100644 --- a/packages/tree-sitter-c/build.sh +++ b/packages/tree-sitter-c/build.sh @@ -3,12 +3,16 @@ TERMUX_PKG_DESCRIPTION="C grammar for tree-sitter" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="Joshua Kahn @TomJo2000" TERMUX_PKG_VERSION="0.24.1" -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://github.com/tree-sitter/tree-sitter-c/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=25dd4bb3dec770769a407e0fc803f424ce02c494a56ce95fedc525316dcf9b48 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_UPDATE_TAG_TYPE='newest-tag' TERMUX_PKG_BUILD_IN_SRC=true +TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +-DCMAKE_INSTALL_LIBDIR=$TERMUX__PREFIX__LIB_SUBDIR +-DCMAKE_INSTALL_INCLUDEDIR=$TERMUX__PREFIX__INCLUDE_SUBDIR +" termux_step_pre_configure() { termux_setup_treesitter diff --git a/packages/tree-sitter-lua/build.sh b/packages/tree-sitter-lua/build.sh index ec8e36736aaba8..2d68fc4caff256 100644 --- a/packages/tree-sitter-lua/build.sh +++ b/packages/tree-sitter-lua/build.sh @@ -3,12 +3,16 @@ TERMUX_PKG_DESCRIPTION="Lua grammar for tree-sitter" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="Joshua Kahn @TomJo2000" TERMUX_PKG_VERSION="0.4.0" -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://github.com/tree-sitter-grammars/tree-sitter-lua/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=b0977aced4a63bb75f26725787e047b8f5f4a092712c840ea7070765d4049559 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_UPDATE_TAG_TYPE='newest-tag' TERMUX_PKG_BUILD_IN_SRC=true +TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +-DCMAKE_INSTALL_LIBDIR=$TERMUX__PREFIX__LIB_SUBDIR +-DCMAKE_INSTALL_INCLUDEDIR=$TERMUX__PREFIX__INCLUDE_SUBDIR +" termux_step_pre_configure() { termux_setup_treesitter diff --git a/packages/tree-sitter-markdown/build.sh b/packages/tree-sitter-markdown/build.sh index 01a5eccac50557..b69eb1eeafc482 100644 --- a/packages/tree-sitter-markdown/build.sh +++ b/packages/tree-sitter-markdown/build.sh @@ -3,12 +3,15 @@ TERMUX_PKG_DESCRIPTION="Markdown grammar for tree-sitter" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="Joshua Kahn @TomJo2000" TERMUX_PKG_VERSION="0.5.1" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/tree-sitter-grammars/tree-sitter-markdown/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=acaffe5a54b4890f1a082ad6b309b600b792e93fc6ee2903d022257d5b15e216 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_UPDATE_TAG_TYPE='newest-tag' TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +-DCMAKE_INSTALL_LIBDIR=$TERMUX__PREFIX__LIB_SUBDIR +-DCMAKE_INSTALL_INCLUDEDIR=$TERMUX__PREFIX__INCLUDE_SUBDIR -DALL_EXTENSIONS=ON " diff --git a/packages/tree-sitter-query/build.sh b/packages/tree-sitter-query/build.sh index a995cc2909a7ae..c57b7091eae3f5 100644 --- a/packages/tree-sitter-query/build.sh +++ b/packages/tree-sitter-query/build.sh @@ -3,11 +3,16 @@ TERMUX_PKG_DESCRIPTION="TS query grammar for tree-sitter" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="Joshua Kahn @TomJo2000" TERMUX_PKG_VERSION="0.7.0" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/tree-sitter-grammars/tree-sitter-query/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=79285847e8350ee9fe1f6f6c9eb64bc14320f70f7b9b65037193fc58f2638613 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_UPDATE_TAG_TYPE='newest-tag' TERMUX_PKG_BUILD_IN_SRC=true +TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +-DCMAKE_INSTALL_LIBDIR=$TERMUX__PREFIX__LIB_SUBDIR +-DCMAKE_INSTALL_INCLUDEDIR=$TERMUX__PREFIX__INCLUDE_SUBDIR +" termux_step_pre_configure() { termux_setup_treesitter