Browse Source

coreutils: Fix broken 32-bit builds. Fixes #2608

android-5
Fredrik Fornwall 7 years ago
parent
commit
86af1159d0
  1. 1
      packages/coreutils/build.sh
  2. 12
      packages/coreutils/lib-stdio-impl.h.patch

1
packages/coreutils/build.sh

@ -1,6 +1,7 @@
TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/coreutils/ 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_DESCRIPTION="Basic file, shell and text manipulation utilities from the GNU project"
TERMUX_PKG_VERSION=8.30 TERMUX_PKG_VERSION=8.30
TERMUX_PKG_REVISION=1
TERMUX_PKG_SHA256=e831b3a86091496cdba720411f9748de81507798f6130adeaef872d206e1b057 TERMUX_PKG_SHA256=e831b3a86091496cdba720411f9748de81507798f6130adeaef872d206e1b057
TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/coreutils/coreutils-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/coreutils/coreutils-${TERMUX_PKG_VERSION}.tar.xz
# pinky has no usage on Android. # pinky has no usage on Android.

12
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
<https://android.googlesource.com/platform/bionic.git/+/f0141dfab10a4b332769d52fa76631a64741297a>
the innards of FILE were public, and fp_ub could be defined like for OpenBSD,
Loading…
Cancel
Save