From f8ead98a8a075a3c71134772c55516a26b3ee413 Mon Sep 17 00:00:00 2001 From: Chongyun Lee <45286352+licy183@users.noreply.github.com> Date: Wed, 13 Dec 2023 19:27:27 +0800 Subject: [PATCH] ndk-sysroot-gcc-compact: fix bug --- ...0010-workaround-for-adl_only-namespace-in-system_error.patch | 2 +- ...orkaround-for-has_specialization-in-segmented_iterator.patch | 2 +- tur/ndk-sysroot-gcc-compact/build.sh | 2 +- 3 files changed, 3 insertions(+), 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 index b4a624fa4..f85ea6432 100644 --- 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/tur/ndk-sysroot-gcc-compact/0011-workaround-for-has_specialization-in-segmented_iterator.patch b/tur/ndk-sysroot-gcc-compact/0011-workaround-for-has_specialization-in-segmented_iterator.patch index 668a2e44a..13df5afa4 100644 --- a/tur/ndk-sysroot-gcc-compact/0011-workaround-for-has_specialization-in-segmented_iterator.patch +++ b/tur/ndk-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 +struct __has_specialization : false_type {}; diff --git a/tur/ndk-sysroot-gcc-compact/build.sh b/tur/ndk-sysroot-gcc-compact/build.sh index e6b9563ec..711d1202d 100644 --- 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 from the previous libutil-dev