sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sharutils: fix build with NDK r23 (#7808)

Browse Source
This commit is contained in:
Henrik Grimler 2021-10-30 14:02:52 +02:00 committed by GitHub
parent ce5e4f1d2b
commit b053e35f4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 58 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/sharutils/build.sh
View File

@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Utilities for packaging and unpackaging shell archives"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=4.15.2
TERMUX_PKG_REVISION=1
TERMUX_PKG_REVISION=2
TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/sharutils/sharutils-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=2b05cff7de5d7b646dc1669bc36c35fdac02ac6ae4b6c19cb3340d87ec553a9a
TERMUX_PKG_DEPENDS="libandroid-support"

44
packages/sharutils/fix-duplicate-symbols.patch Normal file
View File

@ -0,0 +1,44 @@
--- ./src/shar-opts.h 2015-05-30 21:04:12.000000000 +0530
+++ ./src/shar-opts.h.mod 2021-10-30 17:17:40.099631929 +0530
@@ -352,7 +352,7 @@
* global exported definitions
*/
#include "local.h"
-char const * const program_name;
+extern char const * const program_name;
extern bool initialization_done;
extern int optidx;
--- ./src/unshar-opts.h 2015-05-30 21:04:18.000000000 +0530
+++ ./src/unshar-opts.h.mod 2021-10-30 17:17:01.289631943 +0530
@@ -192,7 +192,7 @@
extern size_t separator_str_len;
#include "local.h"
-char const * const program_name;
+extern char const * const program_name;
/* * * * * *
--- ./src/uudecode-opts.h 2015-05-30 21:04:21.000000000 +0530
+++ ./src/uudecode-opts.h.mod 2021-10-30 17:18:33.319631908 +0530
@@ -170,7 +170,7 @@
* global exported definitions
*/
#include "local.h"
-char const * const program_name;
+extern char const * const program_name;
/* * * * * *
--- ./src/uuencode-opts.h 2015-05-30 21:04:25.000000000 +0530
+++ ./src/uuencode-opts.h.mod 2021-10-30 17:18:04.149631919 +0530
@@ -166,7 +166,7 @@
* global exported definitions
*/
#include "local.h"
-char const * const program_name;
+extern char const * const program_name;
/* * * * * *

13
packages/sharutils/lib-stdio-impl.h.patch Normal file
View File

@ -0,0 +1,13 @@
--- ./lib/stdio-impl.h 2021-10-30 16:01:14.636375086 +0530
+++ ./lib/stdio-impl.h.mod 2021-10-30 16:01:32.306375079 +0530
@@ -26,6 +26,10 @@
# include <sys/param.h>
#endif
+#if defined __ANDROID__
+#include <bits/struct_file.h>
+#endif
+
#include <errno.h> /* For detecting Plan9. */
#if defined __sferror || defined __DragonFly__ || defined __ANDROID__