busybox: Update i686 build

This commit is contained in:
Fredrik Fornwall 2015-12-25 19:13:55 -05:00
parent 59d4c3f2a8
commit 4e7183b9b8
2 changed files with 12 additions and 0 deletions

View File

@ -0,0 +1,11 @@
diff -u -r ../busybox-1.24.1/arch/i386/Makefile ./arch/i386/Makefile
--- ../busybox-1.24.1/arch/i386/Makefile 2015-07-12 22:18:46.000000000 -0400
+++ ./arch/i386/Makefile 2015-12-25 19:05:56.660211464 -0500
@@ -4,4 +4,5 @@
# -mpreferred-stack-boundary=2 is essential in preventing gcc 4.2.x
# from aligning stack to 16 bytes. (Which is gcc's way of supporting SSE).
-CFLAGS += $(call cc-option,-march=i386 -mpreferred-stack-boundary=2,)
+# This fixes crashing e.g. running busybox sed -e "s#'#'\"'\"'#g"
+# on the x86_64 emulator.
+# CFLAGS += $(call cc-option,-march=i386 -mpreferred-stack-boundary=2,)

View File

@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=http://www.busybox.net/
TERMUX_PKG_DESCRIPTION="Tiny versions of many common UNIX utilities into a single small executable" TERMUX_PKG_DESCRIPTION="Tiny versions of many common UNIX utilities into a single small executable"
TERMUX_PKG_ESSENTIAL=yes TERMUX_PKG_ESSENTIAL=yes
TERMUX_PKG_VERSION=1.24.1 TERMUX_PKG_VERSION=1.24.1
TERMUX_PKG_BUILD_REVISION=1
TERMUX_PKG_SRCURL=http://www.busybox.net/downloads/busybox-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SRCURL=http://www.busybox.net/downloads/busybox-${TERMUX_PKG_VERSION}.tar.bz2
TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_BUILD_IN_SRC=yes