cpio: fix build with ndk-r23

Without -fcommon we get an error due to program_name being used in two
source files:

ld: error: duplicate symbol: program_name
>>> defined at global.c
>>>            global.o:(program_name)
>>> defined at progname.c
>>>            progname.o:(.bss+0x0) in archive ../gnu/libgnu.a
clang-12: error: linker command failed with exit code 1 (use -v to see invocation)
This commit is contained in:
Henrik Grimler 2021-11-17 21:08:26 +01:00
parent 835e7ad1b9
commit abb053274b
No known key found for this signature in database
GPG Key ID: B0076E490B71616B
2 changed files with 12 additions and 0 deletions

View File

@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="CPIO implementation from the GNU project"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=2.13
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/cpio/cpio-$TERMUX_PKG_VERSION.tar.bz2
TERMUX_PKG_SHA256=eab5bdc5ae1df285c59f2a4f140a98fc33678a0bf61bdba67d9436ae26b46f6d
TERMUX_PKG_DEPENDS="tar"

View File

@ -0,0 +1,11 @@
--- ../global.c.orig 2021-11-17 20:03:46.273607977 +0000
+++ ./src/global.c 2021-11-17 20:04:24.600257641 +0000
@@ -185,7 +185,7 @@
bool to_stdout_option = false;
/* The name this program was run with. */
-char *program_name;
+extern char *program_name;
/* A pointer to either lstat or stat, depending on whether
dereferencing of symlinks is done for input files. */