ndk-sysroot-gcc-compact: fix compilation error

termux-user-repository · Nov 9, 2023 · 8da1c5f · 8da1c5f
1 parent 152867b
commit 8da1c5f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/tur/ndk-sysroot-gcc-compact/0009-workaround-for-no-builtin-is_nothrow_assignable.patch b/tur/ndk-sysroot-gcc-compact/0009-workaround-for-no-builtin-is_nothrow_assignable.patch
@@ -286,14 +286,17 @@ Since commit [1], libcxx assumes that gcc has builtin `__is_nothrow_assignable`
  #if _LIBCPP_STD_VER > 14
 --- a/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/c++/v1/__type_traits/is_nothrow_assignable.h
 +++ b/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/c++/v1/__type_traits/is_nothrow_assignable.h
-@@ -10,6 +10,7 @@
+@@ -10,7 +10,10 @@
  #define _LIBCPP___TYPE_TRAITS_IS_NOTHROW_ASSIGNABLE_H
 
  #include <__config>
 +#include <__type_traits/add_const.h>
  #include <__type_traits/integral_constant.h>
++#include <__type_traits/is_assignable.h>
++#include <__utility/declval.h>
 
  #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
+ #  pragma GCC system_header
 @@ -18,13 +19,39 @@
 
  _LIBCPP_BEGIN_NAMESPACE_STD

diff --git a/tur/ndk-sysroot-gcc-compact/build.sh b/tur/ndk-sysroot-gcc-compact/build.sh
@@ -5,7 +5,7 @@ TERMUX_PKG_MAINTAINER="@licy183"
 # Version should be equal to TERMUX_NDK_{VERSION_NUM,REVISION} in
 # scripts/properties.sh
 TERMUX_PKG_VERSION=26b
-TERMUX_PKG_REVISION=4
+TERMUX_PKG_REVISION=5
 TERMUX_PKG_SRCURL=https://dl.google.com/android/repository/android-ndk-r${TERMUX_PKG_VERSION}-linux.zip
 TERMUX_PKG_SHA256=ad73c0370f0b0a87d1671ed2fd5a9ac9acfd1eb5c43a7fbfbd330f85d19dd632
 # This package has taken over <pty.h> from the previous libutil-dev