ndk-sysroot-gcc-compact: fix bug

termux-user-repository · Dec 13, 2023 · f8ead98 · f8ead98
1 parent cb44214
commit f8ead98
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/tur/ndk-sysroot-gcc-compact/0010-workaround-for-adl_only-namespace-in-system_error.patch b/tur/ndk-sysroot-gcc-compact/0010-workaround-for-adl_only-namespace-in-system_error.patch
@@ -9,7 +9,7 @@ but this breaks compile on gcc-9, gcc-10 and gcc-11.
  namespace __adl_only {
      // Those cause ADL to trigger but they are not viable candidates,
      // so they are never actually selected.
-+#if defined(__GNUC__) && __GNUC__ < 12
++#if defined(_LIBCPP_COMPILER_GCC) && __GNUC__ < 12
 +    void make_error_condition();
 +    void make_error_code();
 +#else

diff --git a/...dk-sysroot-gcc-compact/0011-workaround-for-has_specialization-in-segmented_iterator.patch b/...dk-sysroot-gcc-compact/0011-workaround-for-has_specialization-in-segmented_iterator.patch
@@ -11,7 +11,7 @@ GCC doesn't have proper support for CWG 1315 until commit [2], which is landed i
  };
  */
 
-+#if defined(__GNUC__) && __GNUC__ < 12
++#if defined(_LIBCPP_COMPILER_GCC) && __GNUC__ < 12
 +
 +template <class _Tp, class = void>
 +struct __has_specialization : false_type {};

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=6
+TERMUX_PKG_REVISION=7
 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