Termux
/
termux-packages
mirror of https://github.com/termux/termux-packages
1
0
Fork 0
Code Issues Releases Wiki Activity

scripts: add directory symlink for standalone toolchain 

Needed by rust 1.75.0+
This commit is contained in:
Jia Yuan Lo 2023-11-16 07:12:54 +08:00
parent b26e693d40
commit de112530c4
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/build/termux_step_setup_toolchain.sh
View File

@ -7,10 +7,10 @@ termux_step_setup_toolchain() {
# toolchain setup to ensure that everyone gets an updated
# toolchain
if [ "${TERMUX_NDK_VERSION}" = "26b" ]; then
TERMUX_STANDALONE_TOOLCHAIN+="-v0"
TERMUX_STANDALONE_TOOLCHAIN+="-v1"
termux_setup_toolchain_26b
elif [ "${TERMUX_NDK_VERSION}" = 23c ]; then
TERMUX_STANDALONE_TOOLCHAIN+="-v5"
TERMUX_STANDALONE_TOOLCHAIN+="-v6"
termux_setup_toolchain_23c
else
termux_error_exit "We do not have a setup_toolchain function for NDK version $TERMUX_NDK_VERSION"

7
scripts/build/toolchain/termux_setup_toolchain_23c.sh
View File

@ -181,6 +181,11 @@ termux_setup_toolchain_23c() {
fi
done
# rust 1.75.0+ expects this directory to be present
rm -fr "${_TERMUX_TOOLCHAIN_TMPDIR}"/toolchains
mkdir -p "${_TERMUX_TOOLCHAIN_TMPDIR}"/toolchains/llvm/prebuilt
ln -fs ../../.. "${_TERMUX_TOOLCHAIN_TMPDIR}"/toolchains/llvm/prebuilt/linux-x86_64
# Create a pkg-config wrapper. We use path to host pkg-config to
# avoid picking up a cross-compiled pkg-config later on.
local _HOST_PKGCONFIG
@ -213,7 +218,7 @@ termux_setup_toolchain_23c() {
# Remove <spawn.h> as it's only for future (later than android-27).
# Remove <zlib.h> and <zconf.h> as we build our own zlib.
# Remove unicode headers provided by libicu.
# Remove KRH/khrplatform.h provided by mesa.
# Remove KHR/khrplatform.h provided by mesa.
# Remove NDK vulkan headers.
rm usr/include/{sys/{capability,shm,sem},{glob,iconv,spawn,zlib,zconf},KHR/khrplatform}.h
rm usr/include/unicode/{char16ptr,platform,ptypes,putil,stringoptions,ubidi,ubrk,uchar,uconfig,ucpmap,udisplaycontext,uenum,uldnames,ulocdata,uloc,umachine,unorm2,urename,uscript,ustring,utext,utf16,utf8,utf,utf_old,utypes,uvernum,uversion}.h

5
scripts/build/toolchain/termux_setup_toolchain_26b.sh
View File

@ -182,6 +182,11 @@ termux_setup_toolchain_26b() {
fi
done
# rust 1.75.0+ expects this directory to be present
rm -fr "${_TERMUX_TOOLCHAIN_TMPDIR}"/toolchains
mkdir -p "${_TERMUX_TOOLCHAIN_TMPDIR}"/toolchains/llvm/prebuilt
ln -fs ../../.. "${_TERMUX_TOOLCHAIN_TMPDIR}"/toolchains/llvm/prebuilt/linux-x86_64
# Create a pkg-config wrapper. We use path to host pkg-config to
# avoid picking up a cross-compiled pkg-config later on.
local _HOST_PKGCONFIG