From 5cfef17a9d5d54ff75b16a7ebab2caf10bcd49df Mon Sep 17 00:00:00 2001 From: termux-pacman-bot Date: Mon, 3 Apr 2023 15:01:31 +0000 Subject: [PATCH] tree: Declare `strverscmp` %ci:no-build --- packages/tree/build.sh | 1 - .../{strverscmp.c.patch => strverscmp.patch} | 17 ++++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) rename packages/tree/{strverscmp.c.patch => strverscmp.patch} (61%) diff --git a/packages/tree/build.sh b/packages/tree/build.sh index 34c01a1cd0..8919317c7a 100644 --- a/packages/tree/build.sh +++ b/packages/tree/build.sh @@ -6,7 +6,6 @@ TERMUX_PKG_VERSION="2.1.0" TERMUX_PKG_SRCURL="https://gitlab.com/OldManProgrammer/unix-tree/-/archive/${TERMUX_PKG_VERSION}/unix-tree-${TERMUX_PKG_VERSION}.tar.gz" TERMUX_PKG_SHA256=e9f829a03996451bcf90fae4fdee4285bece6dc1a89de92a3f8e6cad29e03c71 TERMUX_PKG_AUTO_UPDATE=true -TERMUX_PKG_ENABLE_CLANG16_PORTING=false TERMUX_PKG_UPDATE_TAG_TYPE="newest-tag" TERMUX_PKG_DEPENDS="libandroid-support" TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/tree/strverscmp.c.patch b/packages/tree/strverscmp.patch similarity index 61% rename from packages/tree/strverscmp.c.patch rename to packages/tree/strverscmp.patch index 51c6b4f4a5..d0857261e9 100644 --- a/packages/tree/strverscmp.c.patch +++ b/packages/tree/strverscmp.patch @@ -9,10 +9,13 @@ /* @deftypefun int strverscmp (const char *@var{s1}, const char *@var{s2}) -@@ -157,4 +157,4 @@ - return state; - } - } --#endif -\ No newline at end of file -+#endif +--- a/tree.h ++++ b/tree.h +@@ -307,6 +307,6 @@ + + + /* We use the strverscmp.c file if we're not linux: */ +-#ifndef __linux__ ++#if defined(__ANDROID__) || !defined(__linux__) + int strverscmp (const char *s1, const char *s2); + #endif