From 0396f55b6b758c63e1e7cc3b04b90c9b087ab55c Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Wed, 17 Nov 2021 19:35:23 +0100 Subject: [PATCH] silversearcher-ag: fix build with ndk-r23 Build fails due to duplicated/shared variables, like: [...] ld: error: duplicate symbol: out_fd >>> defined at ignore.c >>> src/ignore.o:(out_fd) >>> defined at scandir.c >>> src/scandir.o:(.bss+0x188) ld: error: duplicate symbol: print_mtx >>> defined at ignore.c >>> src/ignore.o:(print_mtx) >>> defined at scandir.c >>> src/scandir.o:(.bss+0x8) ld: error: duplicate symbol: root_ignores >>> defined at ignore.c >>> src/ignore.o:(root_ignores) >>> defined at scandir.c >>> src/scandir.o:(.bss+0x0) ld: error: duplicate symbol: stats >>> defined at ignore.c >>> src/ignore.o:(stats) >>> defined at scandir.c >>> src/scandir.o:(.bss+0x190) ld: error: duplicate symbol: alpha_skip_lookup >>> defined at print.c >>> src/print.o:(alpha_skip_lookup) >>> defined at search.c >>> src/search.o:(.bss+0x102B0) --- packages/silversearcher-ag/build.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/silversearcher-ag/build.sh b/packages/silversearcher-ag/build.sh index 1ab5cd29f..3ec64f39b 100644 --- a/packages/silversearcher-ag/build.sh +++ b/packages/silversearcher-ag/build.sh @@ -3,7 +3,11 @@ TERMUX_PKG_DESCRIPTION="Fast grep-like program, alternative to ack-grep" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=2.2.0 -TERMUX_PKG_REVISION=4 +TERMUX_PKG_REVISION=5 TERMUX_PKG_SRCURL=https://geoff.greer.fm/ag/releases/the_silver_searcher-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=d9621a878542f3733b5c6e71c849b9d1a830ed77cb1a1f6c2ea441d4b0643170 TERMUX_PKG_DEPENDS="pcre, liblzma, zlib" + +termux_step_pre_configure() { + export CFLAGS+=" -fcommon" +}