From 4e7183b9b8a6f82e4a5e6daa12291d35e52976e6 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Fri, 25 Dec 2015 19:13:55 -0500 Subject: [PATCH] busybox: Update i686 build --- packages/busybox/arch-i386-Makefile.patch | 11 +++++++++++ packages/busybox/build.sh | 1 + 2 files changed, 12 insertions(+) create mode 100644 packages/busybox/arch-i386-Makefile.patch diff --git a/packages/busybox/arch-i386-Makefile.patch b/packages/busybox/arch-i386-Makefile.patch new file mode 100644 index 000000000..9e48e1b6a --- /dev/null +++ b/packages/busybox/arch-i386-Makefile.patch @@ -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,) diff --git a/packages/busybox/build.sh b/packages/busybox/build.sh index df433eb55..5f73f8475 100755 --- a/packages/busybox/build.sh +++ b/packages/busybox/build.sh @@ -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_ESSENTIAL=yes 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_BUILD_IN_SRC=yes