Browse Source

busybox: Fix less and build with clang on arm

Patch less in a similar manner as svlogd.
android-5
Henrik Grimler 7 years ago
committed by Fredrik Fornwall
parent
commit
2bec39428d
  1. 22
      packages/busybox/build-with-clang.patch
  2. 3
      packages/busybox/build.sh
  3. 12
      packages/busybox/svlogd.c.patch

22
packages/busybox/build-with-clang.patch

@ -0,0 +1,22 @@
svlogd, less (and others?) don't work with clang.
Patch inspired by http://landley.net/mantis/mantis-2344.html
--- ../svlogd.c.orig 2018-06-07 19:34:47.442867090 +0000
+++ ./runit/svlogd.c 2018-06-07 19:35:16.438776951 +0000
@@ -244,6 +244,7 @@
#define INIT_G() do { \
setup_common_bufsiz(); \
SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
+ asm volatile("":::"memory"); \
linemax = 1000; \
/*buflen = 1024;*/ \
linecomplete = 1; \
--- ../less.c.orig 2018-06-07 20:50:47.743373352 +0000
+++ ./miscutils/less.c 2018-06-07 20:51:31.467242215 +0000
@@ -253,6 +253,7 @@
#define kbd_input (G.kbd_input )
#define INIT_G() do { \
SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
+ asm volatile("":::"memory"); \
less_gets_pos = -1; \
empty_line_marker = "~"; \
num_files = 1; \

3
packages/busybox/build.sh

@ -6,9 +6,6 @@ TERMUX_PKG_REVISION=1
TERMUX_PKG_SHA256=e3c14a3699dc7e82fed397392957afc78e37bdf25398ac38ead6e84621b2ae6a
TERMUX_PKG_SRCURL=https://busybox.net/downloads/busybox-${TERMUX_PKG_VERSION}.tar.bz2
TERMUX_PKG_BUILD_IN_SRC=yes
if [ $TERMUX_ARCH = arm ]; then
TERMUX_PKG_CLANG=no
fi
# We replace env in the old coreutils package:
TERMUX_PKG_CONFLICTS="coreutils (<< 8.25-4)"

12
packages/busybox/svlogd.c.patch

@ -1,12 +0,0 @@
svlogd doesn't work with clang.
Patch inspired by http://landley.net/mantis/mantis-2344.html
--- ../svlogd.c.orig 2018-06-07 19:34:47.442867090 +0000
+++ ./runit/svlogd.c 2018-06-07 19:35:16.438776951 +0000
@@ -244,6 +244,7 @@
#define INIT_G() do { \
setup_common_bufsiz(); \
SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
+ asm volatile("":::"memory"); \
linemax = 1000; \
/*buflen = 1024;*/ \
linecomplete = 1; \
Loading…
Cancel
Save