From 925dfdd6e6827b602ad66f96eb2caac0341de453 Mon Sep 17 00:00:00 2001 From: termux-pacman-bot Date: Tue, 1 Nov 2022 20:40:50 +0000 Subject: [PATCH] Update repo --- scripts/build/termux_step_setup_toolchain.sh | 2 +- scripts/build/toolchain/termux_setup_toolchain_25b.sh | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/build/termux_step_setup_toolchain.sh b/scripts/build/termux_step_setup_toolchain.sh index 07b53a9a83..4cf138f42c 100644 --- a/scripts/build/termux_step_setup_toolchain.sh +++ b/scripts/build/termux_step_setup_toolchain.sh @@ -6,7 +6,7 @@ termux_step_setup_toolchain() { # toolchain setup to ensure that everyone gets an updated # toolchain if [ "${TERMUX_NDK_VERSION}" = 25b ]; then - TERMUX_STANDALONE_TOOLCHAIN+="-v0" + TERMUX_STANDALONE_TOOLCHAIN+="-v1" termux_setup_toolchain_25b elif [ "${TERMUX_NDK_VERSION}" = 23c ]; then TERMUX_STANDALONE_TOOLCHAIN+="-v2" diff --git a/scripts/build/toolchain/termux_setup_toolchain_25b.sh b/scripts/build/toolchain/termux_setup_toolchain_25b.sh index bb8f7207da..eb683cf395 100644 --- a/scripts/build/toolchain/termux_setup_toolchain_25b.sh +++ b/scripts/build/toolchain/termux_setup_toolchain_25b.sh @@ -196,12 +196,14 @@ termux_setup_toolchain_25b() { # Remove as it's only for future (later than android-27). # Remove and 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 GLES, GLES2, and GLES3 provided by mesa. # Remove execinfo provided by libandroid-execinfo. # Remove NDK vulkan headers. rm usr/include/{sys/{capability,shm,sem},{glob,iconv,spawn,zlib,zconf},KHR/khrplatform,execinfo}.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 rm -Rf usr/include/vulkan + rm -Rf usr/include/GLES{,2,3} sed -i "s/define __ANDROID_API__ __ANDROID_API_FUTURE__/define __ANDROID_API__ $TERMUX_PKG_API_LEVEL/" \ usr/include/android/api-level.h