From a4d83af9d0bbb0757619e9129442c0bb7db70dec Mon Sep 17 00:00:00 2001 From: its-pointless Date: Fri, 7 Aug 2020 10:03:19 +1000 Subject: [PATCH] fix busybox vi ed awk diff --- packages/busybox/build.sh | 2 +- .../busybox/fixeditors_built_with_clang.patch | 40 +++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 packages/busybox/fixeditors_built_with_clang.patch diff --git a/packages/busybox/build.sh b/packages/busybox/build.sh index 0ba602559..4d88f54e3 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.32.0 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://busybox.net/downloads/busybox-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=c35d87f1d04b2b153d33c275c2632e40d388a88f19a9e71727e0bbbff51fe689 TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/busybox/fixeditors_built_with_clang.patch b/packages/busybox/fixeditors_built_with_clang.patch new file mode 100644 index 000000000..910fafed7 --- /dev/null +++ b/packages/busybox/fixeditors_built_with_clang.patch @@ -0,0 +1,40 @@ +--- ./editors/vi.c.orig 2020-08-06 23:54:05.454464571 +0000 ++++ ./editors/vi.c 2020-08-06 23:54:59.007378601 +0000 +@@ -4314,6 +4314,7 @@ + #undef cur_line + } + ++#pragma clang optimize off + int vi_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; + int vi_main(int argc, char **argv) + { +--- ./editors/ed.c.orig 2020-08-06 23:55:28.927889014 +0000 ++++ ./editors/ed.c 2020-08-06 23:55:36.836023886 +0000 +@@ -990,6 +990,7 @@ + } + } + ++#pragma clang optimize off + int ed_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; + int ed_main(int argc UNUSED_PARAM, char **argv) + { +--- ./editors/awk.c.orig 2020-08-06 23:57:12.149648346 +0000 ++++ ./editors/awk.c 2020-08-06 23:57:31.737981962 +0000 +@@ -3190,6 +3190,7 @@ + #undef files_happen + } + ++#pragma clang optimize off + int awk_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; + int awk_main(int argc UNUSED_PARAM, char **argv) + { +--- ./editors/diff.c.orig 2020-08-06 23:58:55.919414780 +0000 ++++ ./editors/diff.c 2020-08-06 23:59:09.719649530 +0000 +@@ -972,6 +972,7 @@ + # define LONGOPTS + #endif + ++#pragma clang optimize off + int diff_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; + int diff_main(int argc UNUSED_PARAM, char **argv) + {