From a84e862365acaca8693efb0d0c5a7732721307c5 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Mon, 16 Aug 2021 17:08:43 +0200 Subject: [PATCH] ndk-patches: remove TCAFLUSH case from bits/termios_inlines.h To fix error: In file included from /termux-build/_cache/android-r23-api-24-v0/bin/../sysroot/usr/include/termios.h:154: In file included from /termux-build/_cache/android-r23-api-24-v0/bin/../sysroot/usr/include/android/legacy_termios_inlines.h:43: /termux-build/_cache/android-r23-api-24-v0/bin/../sysroot/usr/include/bits/termios_inlines.h:120:10: error: duplicate case value '0' case TCSAFLUSH: cmd = TCSETSF; break; ^ /termux-build/_cache/android-r23-api-24-v0/bin/../sysroot/usr/include/asm-generic/termbits.h:194:19: note: expanded from macro 'TCSAFLUSH' ^ /termux-build/_cache/android-r23-api-24-v0/bin/../sysroot/usr/include/bits/termios_inlines.h:118:10: note: previous case defined here case TCSANOW: cmd = TCSETS; break; ^ /termux-build/_cache/android-r23-api-24-v0/bin/../sysroot/usr/include/asm-generic/termbits.h:191:17: note: expanded from macro 'TCSANOW' ^ --- ...neric-termbits.h.patch => redefine-TCSAFLUSH.patch} | 10 ++++++++++ 1 file changed, 10 insertions(+) rename ndk-patches/{asm-generic-termbits.h.patch => redefine-TCSAFLUSH.patch} (56%) diff --git a/ndk-patches/asm-generic-termbits.h.patch b/ndk-patches/redefine-TCSAFLUSH.patch similarity index 56% rename from ndk-patches/asm-generic-termbits.h.patch rename to ndk-patches/redefine-TCSAFLUSH.patch index 6b4ecb4dd0..c063a89586 100644 --- a/ndk-patches/asm-generic-termbits.h.patch +++ b/ndk-patches/redefine-TCSAFLUSH.patch @@ -9,3 +9,13 @@ diff -u -r /home/builder/lib/android-ndk/sysroot/usr/include/asm-generic/termbit +/* TCSAFLUSH is patched to be TCSANOW in Termux to work around Android SELinux rule */ +#define TCSAFLUSH 0 #endif +--- ./usr/include/bits/termios_inlines.h.orig 2021-08-16 17:05:16.001067630 +0200 ++++ ./usr/include/bits/termios_inlines.h 2021-08-16 17:05:05.851074187 +0200 +@@ -117,7 +117,6 @@ + switch (optional_actions) { + case TCSANOW: cmd = TCSETS; break; + case TCSADRAIN: cmd = TCSETSW; break; +- case TCSAFLUSH: cmd = TCSETSF; break; + default: errno = EINVAL; return -1; + } + return ioctl(fd, cmd, s);