From 86af1159d0d487368aab2494904e89b86f042fe2 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Tue, 3 Jul 2018 11:17:00 +0200 Subject: [PATCH] coreutils: Fix broken 32-bit builds. Fixes #2608 --- packages/coreutils/build.sh | 1 + packages/coreutils/lib-stdio-impl.h.patch | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 packages/coreutils/lib-stdio-impl.h.patch diff --git a/packages/coreutils/build.sh b/packages/coreutils/build.sh index b4d9d8dec..06fdef5f0 100755 --- a/packages/coreutils/build.sh +++ b/packages/coreutils/build.sh @@ -1,6 +1,7 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/coreutils/ TERMUX_PKG_DESCRIPTION="Basic file, shell and text manipulation utilities from the GNU project" TERMUX_PKG_VERSION=8.30 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=e831b3a86091496cdba720411f9748de81507798f6130adeaef872d206e1b057 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/coreutils/coreutils-${TERMUX_PKG_VERSION}.tar.xz # pinky has no usage on Android. diff --git a/packages/coreutils/lib-stdio-impl.h.patch b/packages/coreutils/lib-stdio-impl.h.patch new file mode 100644 index 000000000..d3bfbd53a --- /dev/null +++ b/packages/coreutils/lib-stdio-impl.h.patch @@ -0,0 +1,12 @@ +diff -u -r ../coreutils-8.30/lib/stdio-impl.h ./lib/stdio-impl.h +--- ../coreutils-8.30/lib/stdio-impl.h 2018-06-24 06:52:06.000000000 +0200 ++++ ./lib/stdio-impl.h 2018-07-03 11:05:27.353619181 +0200 +@@ -60,7 +60,7 @@ + # define _flags pub._flags + # define _r pub._r + # define _w pub._w +-# elif defined __ANDROID__ /* Android */ ++# elif defined __ANDROID_BUT_THIS_IS_BROKEN__ /* Android */ + /* Up to this commit from 2015-10-12 + + the innards of FILE were public, and fp_ub could be defined like for OpenBSD,