fix(main/libsamplerate): Fix paths in pkgconfig file #26831
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Previously, TERMUX_PREFIX was prepended twice in libdir and includedir.
robertkirkman
approved these changes
Oct 11, 2025
Member
I'll get on that as soon as I get home. |
robertkirkman
added a commit
that referenced
this pull request
Nov 18, 2025
…NCLUDEDIR` to packages that otherwise generate invalid `.cmake` and `.pc` files - like - #25694 - #26831 - #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`
termux-pacman-bot
added a commit
to termux-pacman/termux-packages
that referenced
this pull request
Nov 18, 2025
…NCLUDEDIR` to packages that otherwise generate invalid `.cmake` and `.pc` files - like - termux/termux-packages#25694 - termux/termux-packages#26831 - termux/termux-packages#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`
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously, TERMUX_PREFIX was prepended twice in libdir and includedir.