From 608d6f3cc486d2b2bf96337fe14a5ceee4102ce6 Mon Sep 17 00:00:00 2001 From: termux-pacman-bot Date: Sat, 1 Apr 2023 15:01:25 +0000 Subject: [PATCH] bash: Fix `getconf` loadable `confstr` is not available to Android. --- packages/bash/build.sh | 2 +- .../bash/examples-loadables-getconf.c.patch | 23 +++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/packages/bash/build.sh b/packages/bash/build.sh index e6a1712ed4..74e787d53c 100644 --- a/packages/bash/build.sh +++ b/packages/bash/build.sh @@ -5,6 +5,7 @@ TERMUX_PKG_MAINTAINER="@termux" _MAIN_VERSION=5.2 _PATCH_VERSION=15 TERMUX_PKG_VERSION=${_MAIN_VERSION}.${_PATCH_VERSION} +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/bash/bash-${_MAIN_VERSION}.tar.gz TERMUX_PKG_SHA256=a139c166df7ff4471c5e0733051642ee5556c1cc8a4a78f145583c5c81ab32fb TERMUX_PKG_DEPENDS="libandroid-support, libiconv, readline (>= 8.0), termux-tools" @@ -12,7 +13,6 @@ TERMUX_PKG_RECOMMENDS="command-not-found, bash-completion" TERMUX_PKG_BREAKS="bash-dev" TERMUX_PKG_REPLACES="bash-dev" TERMUX_PKG_ESSENTIAL=true -TERMUX_PKG_ENABLE_CLANG16_PORTING=false TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-multibyte --without-bash-malloc --with-installed-readline" diff --git a/packages/bash/examples-loadables-getconf.c.patch b/packages/bash/examples-loadables-getconf.c.patch index a4c4d552e7..e7f213a750 100644 --- a/packages/bash/examples-loadables-getconf.c.patch +++ b/packages/bash/examples-loadables-getconf.c.patch @@ -12,3 +12,26 @@ diff -uNr bash-5.2/examples/loadables/getconf.c bash-5.2.mod/examples/loadables/ /* LFS */ #ifdef _CS_LFS_CFLAGS +@@ -1072,6 +1074,7 @@ + printf ("%ld\n", value); + return (EXECUTION_SUCCESS); + ++#ifndef __ANDROID__ + case CONFSTR: + errno = 0; + clen = confstr (cn, (char *) NULL, 0); +@@ -1092,10 +1095,14 @@ + printf ("%.*s\n", (int) clen, cvalue); + free (cvalue); + return (EXECUTION_SUCCESS); ++#endif + + case CONSTANT: + return (getconf_internal (c, all)); + ++#ifdef __ANDROID__ ++ case CONFSTR: ++#endif + case UNDEFINED: + builtin_error ("%s: undefined", c->name); + return (EXECUTION_FAILURE);