From 2ebffe1f7e87e1095635292e87676ad286343049 Mon Sep 17 00:00:00 2001
From: Henrik Grimler <Henrik@Grimler.se>
Date: Thu, 7 Jun 2018 22:19:36 +0200
Subject: [PATCH] busybox: fix #2448 and debug build

Busybox builds "busybox" and "busybox_unstripped", where the latter contains
debug symbols.
---
 packages/busybox/build.sh       |  4 ++++
 packages/busybox/svlogd.c.patch | 12 ++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 packages/busybox/svlogd.c.patch

diff --git a/packages/busybox/build.sh b/packages/busybox/build.sh
index c60297315..9a5e1606f 100755
--- a/packages/busybox/build.sh
+++ b/packages/busybox/build.sh
@@ -2,6 +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_ESSENTIAL=yes
 TERMUX_PKG_VERSION=1.28.4
+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
@@ -27,6 +28,9 @@ termux_step_configure () {
 }
 
 termux_step_post_make_install () {
+	if [ "$TERMUX_DEBUG" == "true" ]; then
+		install busybox_unstripped $PREFIX/bin/busybox
+	fi
 	# Create symlinks in $PREFIX/bin/applets to $PREFIX/bin/busybox
 	rm -Rf $TERMUX_PREFIX/bin/applets
 	mkdir -p $TERMUX_PREFIX/bin/applets
diff --git a/packages/busybox/svlogd.c.patch b/packages/busybox/svlogd.c.patch
new file mode 100644
index 000000000..dbb2caf93
--- /dev/null
+++ b/packages/busybox/svlogd.c.patch
@@ -0,0 +1,12 @@
+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; \