diff --git a/packages/busybox/0001-clang-fix.patch b/packages/busybox/0001-clang-fix.patch index 562867b45..e18ebdbca 100644 --- a/packages/busybox/0001-clang-fix.patch +++ b/packages/busybox/0001-clang-fix.patch @@ -1,3 +1,33 @@ +diff -uNr busybox-1.31.1/libbb/lineedit.c busybox-1.31.1.mod/libbb/lineedit.c +--- busybox-1.31.1/libbb/lineedit.c 2019-06-10 13:50:53.000000000 +0300 ++++ busybox-1.31.1.mod/libbb/lineedit.c 2019-11-12 12:54:35.000425941 +0200 +@@ -2337,6 +2337,7 @@ + * (in both cases the cursor remains on the input line, '\n' is not printed) + * >0 length of input string, including terminating '\n' + */ ++#pragma clang optimize off + int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *command, int maxsize) + { + int len, n; +diff -uNr busybox-1.31.1/miscutils/bc.c busybox-1.31.1.mod/miscutils/bc.c +--- busybox-1.31.1/miscutils/bc.c 2019-10-21 17:54:40.000000000 +0300 ++++ busybox-1.31.1.mod/miscutils/bc.c 2019-11-12 12:48:49.419098420 +0200 +@@ -7435,6 +7435,7 @@ + } + + #if ENABLE_BC ++#pragma clang optimize off + int bc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; + int bc_main(int argc UNUSED_PARAM, char **argv) + { +@@ -7454,6 +7455,7 @@ + #endif + + #if ENABLE_DC ++#pragma clang optimize off + int dc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; + int dc_main(int argc UNUSED_PARAM, char **argv) + { diff -uNr busybox-1.31.1/miscutils/less.c busybox-1.31.1.mod/miscutils/less.c --- busybox-1.31.1/miscutils/less.c 2019-06-10 13:50:53.000000000 +0300 +++ busybox-1.31.1.mod/miscutils/less.c 2019-11-12 03:30:59.054944977 +0200 @@ -32,6 +62,17 @@ diff -uNr busybox-1.31.1/networking/httpd.c busybox-1.31.1.mod/networking/httpd. int httpd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int httpd_main(int argc UNUSED_PARAM, char **argv) { +diff -uNr busybox-1.31.1/procps/nmeter.c busybox-1.31.1.mod/procps/nmeter.c +--- busybox-1.31.1/procps/nmeter.c 2019-06-10 13:50:53.000000000 +0300 ++++ busybox-1.31.1.mod/procps/nmeter.c 2019-11-12 12:59:16.564931184 +0200 +@@ -821,6 +821,7 @@ + init_cr + }; + ++#pragma clang optimize off + int nmeter_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; + int nmeter_main(int argc UNUSED_PARAM, char **argv) + { diff -uNr busybox-1.31.1/runit/svlogd.c busybox-1.31.1.mod/runit/svlogd.c --- busybox-1.31.1/runit/svlogd.c 2019-06-10 13:50:53.000000000 +0300 +++ busybox-1.31.1.mod/runit/svlogd.c 2019-11-12 03:28:11.214155815 +0200 diff --git a/packages/busybox/build.sh b/packages/busybox/build.sh index 710be1cc1..b2bb6fc5f 100644 --- a/packages/busybox/build.sh +++ b/packages/busybox/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://busybox.net/ TERMUX_PKG_DESCRIPTION="Tiny versions of many common UNIX utilities into a single small executable" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=1.31.1 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://busybox.net/downloads/busybox-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=d0f940a72f648943c1f2211e0e3117387c31d765137d92bd8284a3fb9752a998 TERMUX_PKG_BUILD_IN_SRC=true