tar: Update from 1.30 to 1.31

This commit is contained in:
Fredrik Fornwall 2019-01-03 02:08:10 +01:00
parent ba2db0eb22
commit 23731201ee
2 changed files with 20 additions and 5 deletions

View File

@ -1,15 +1,18 @@
TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/tar/
TERMUX_PKG_DESCRIPTION="GNU tar for manipulating tar archives"
TERMUX_PKG_VERSION=1.30
TERMUX_PKG_REVISION=1
TERMUX_PKG_VERSION=1.31
TERMUX_PKG_SHA256=37f3ef1ceebd8b7e1ebf5b8cc6c65bb8ebf002c7d049032bf456860f25ec2dc1
TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/tar/tar-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=f1bf92dbb1e1ab27911a861ea8dde8208ee774866c46c0bb6ead41f4d1f4d2d3
# Allow xz compression (busybox only provides xz decompression):
TERMUX_PKG_DEPENDS="xz-utils"
TERMUX_PKG_DEPENDS="xz-utils, libandroid-glob"
# When cross-compiling configure guesses that d_ino in struct dirent only exists
# if triplet matches linux*-gnu*, so we force set it explicitly:
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="gl_cv_struct_dirent_d_ino=yes"
# this needed to disable tar's implementation of mkfifoat() so it is possible
# to use own implementation (see patch 'mkfifoat.patch').
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_func_mkfifoat=yes"
termux_step_pre_configure() {
CPPFLAGS+=" -D__USE_FORTIFY_LEVEL=0"
LDFLAGS+=" -landroid-glob"
}

View File

@ -0,0 +1,12 @@
diff -u -r ../tar-1.31/gnu/stdio-impl.h ./gnu/stdio-impl.h
--- ../tar-1.31/gnu/stdio-impl.h 2019-01-02 18:16:01.000000000 +0000
+++ ./gnu/stdio-impl.h 2019-01-03 00:26:16.683764235 +0000
@@ -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,