From 369d15f4ef9f0db258949d251194f4a8f991bd08 Mon Sep 17 00:00:00 2001
From: Lucy Phipps <landfillbaby69@gmail.com>
Date: Mon, 29 Nov 2021 07:58:58 +0000
Subject: [PATCH] ndk-patches: disable AT_EACCESS

https://android.googlesource.com/platform/bionic.git/+/refs/tags/ndk-r23b/libc/bionic/faccessat.cpp#50
---
 ndk-patches/linux-fcntl.h                | 11 +++++++++++
 scripts/build/termux_step_start_build.sh |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 ndk-patches/linux-fcntl.h

diff --git a/ndk-patches/linux-fcntl.h b/ndk-patches/linux-fcntl.h
new file mode 100644
index 000000000..62b0cd658
--- /dev/null
+++ b/ndk-patches/linux-fcntl.h
@@ -0,0 +1,11 @@
+--- ./usr/include/fcntl.h
++++ ./usr/include/fcntl.h
+@@ -54,7 +54,7 @@
+ #define DN_MULTISHOT 0x80000000
+ #define AT_FDCWD - 100
+ #define AT_SYMLINK_NOFOLLOW 0x100
+-#define AT_EACCESS 0x200
++#define AT_EACCESS 0
+ #define AT_REMOVEDIR 0x200
+ #define AT_SYMLINK_FOLLOW 0x400
+ #define AT_NO_AUTOMOUNT 0x800
diff --git a/scripts/build/termux_step_start_build.sh b/scripts/build/termux_step_start_build.sh
index fa537c6f1..1e4979eda 100644
--- a/scripts/build/termux_step_start_build.sh
+++ b/scripts/build/termux_step_start_build.sh
@@ -2,7 +2,7 @@ termux_step_start_build() {
 	TERMUX_STANDALONE_TOOLCHAIN="$TERMUX_COMMON_CACHEDIR/android-r${TERMUX_NDK_VERSION}-api-${TERMUX_PKG_API_LEVEL}"
 	# Bump the below version if a change is made in toolchain setup to ensure
 	# that everyone gets an updated toolchain:
-	TERMUX_STANDALONE_TOOLCHAIN+="-v2"
+	TERMUX_STANDALONE_TOOLCHAIN+="-v3"
 
 	# shellcheck source=/dev/null
 	source "$TERMUX_PKG_BUILDER_SCRIPT"