essential tools: Fix implementation of `struct __sFILE`
This commit is contained in:
parent
f659f221f6
commit
c498746ee5
|
@ -3,13 +3,14 @@ TERMUX_PKG_DESCRIPTION="General-purpose parser generator"
|
|||
TERMUX_PKG_LICENSE="GPL-3.0"
|
||||
TERMUX_PKG_MAINTAINER="@termux"
|
||||
TERMUX_PKG_VERSION=3.8.2
|
||||
TERMUX_PKG_REVISION=2
|
||||
TERMUX_PKG_REVISION=3
|
||||
TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/bison/bison-${TERMUX_PKG_VERSION}.tar.xz
|
||||
TERMUX_PKG_SHA256=9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2
|
||||
TERMUX_PKG_DEPENDS="m4"
|
||||
TERMUX_PKG_BUILD_IN_SRC=true
|
||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
|
||||
M4=m4
|
||||
ac_cv_have_decl_posix_spawn=no
|
||||
ac_cv_header_spawn_h=no
|
||||
"
|
||||
|
||||
|
|
|
@ -0,0 +1,22 @@
|
|||
--- a/lib/stdio-impl.h
|
||||
+++ b/lib/stdio-impl.h
|
||||
@@ -68,8 +68,10 @@
|
||||
# elif defined __ANDROID__ /* Android */
|
||||
# ifdef __LP64__
|
||||
# define _gl_flags_file_t int
|
||||
+# define _gl_struct_file_off_t int64_t
|
||||
# else
|
||||
# define _gl_flags_file_t short
|
||||
+# define _gl_struct_file_off_t __kernel_off_t
|
||||
# endif
|
||||
/* Up to this commit from 2015-10-12
|
||||
<https://android.googlesource.com/platform/bionic.git/+/f0141dfab10a4b332769d52fa76631a64741297a>
|
||||
@@ -96,7 +98,7 @@
|
||||
unsigned char _nbuf[1]; \
|
||||
struct { unsigned char *_base; size_t _size; } _lb; \
|
||||
int _blksize; \
|
||||
- fpos_t _offset; \
|
||||
+ _gl_struct_file_off_t _offset; \
|
||||
/* More fields, not relevant here. */ \
|
||||
} *) fp)
|
||||
# else
|
|
@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Utilities to find files meeting specified criteria and p
|
|||
TERMUX_PKG_LICENSE="GPL-3.0"
|
||||
TERMUX_PKG_MAINTAINER="@termux"
|
||||
TERMUX_PKG_VERSION=4.9.0
|
||||
TERMUX_PKG_REVISION=1
|
||||
TERMUX_PKG_REVISION=2
|
||||
TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/findutils/findutils-${TERMUX_PKG_VERSION}.tar.xz
|
||||
TERMUX_PKG_SHA256=a2bfb8c09d436770edc59f50fa483e785b161a3b7b9d547573cb08065fd462fe
|
||||
TERMUX_PKG_DEPENDS="libandroid-support"
|
||||
|
|
|
@ -0,0 +1,22 @@
|
|||
--- a/gl/lib/stdio-impl.h
|
||||
+++ b/gl/lib/stdio-impl.h
|
||||
@@ -68,8 +68,10 @@
|
||||
# elif defined __ANDROID__ /* Android */
|
||||
# ifdef __LP64__
|
||||
# define _gl_flags_file_t int
|
||||
+# define _gl_struct_file_off_t int64_t
|
||||
# else
|
||||
# define _gl_flags_file_t short
|
||||
+# define _gl_struct_file_off_t __kernel_off_t
|
||||
# endif
|
||||
/* Up to this commit from 2015-10-12
|
||||
<https://android.googlesource.com/platform/bionic.git/+/f0141dfab10a4b332769d52fa76631a64741297a>
|
||||
@@ -96,7 +98,7 @@
|
||||
unsigned char _nbuf[1]; \
|
||||
struct { unsigned char *_base; size_t _size; } _lb; \
|
||||
int _blksize; \
|
||||
- fpos_t _offset; \
|
||||
+ _gl_struct_file_off_t _offset; \
|
||||
/* More fields, not relevant here. */ \
|
||||
} *) fp)
|
||||
# else
|
|
@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Command which searches one or more input files for lines
|
|||
TERMUX_PKG_LICENSE="GPL-3.0"
|
||||
TERMUX_PKG_MAINTAINER="@termux"
|
||||
TERMUX_PKG_VERSION=3.8
|
||||
TERMUX_PKG_REVISION=1
|
||||
TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/grep/grep-${TERMUX_PKG_VERSION}.tar.xz
|
||||
TERMUX_PKG_SHA256=498d7cc1b4fb081904d87343febb73475cf771e424fb7e6141aff66013abc382
|
||||
TERMUX_PKG_DEPENDS="libandroid-support, pcre2"
|
||||
|
|
|
@ -0,0 +1,22 @@
|
|||
--- a/lib/stdio-impl.h
|
||||
+++ b/lib/stdio-impl.h
|
||||
@@ -68,8 +68,10 @@
|
||||
# elif defined __ANDROID__ /* Android */
|
||||
# ifdef __LP64__
|
||||
# define _gl_flags_file_t int
|
||||
+# define _gl_struct_file_off_t int64_t
|
||||
# else
|
||||
# define _gl_flags_file_t short
|
||||
+# define _gl_struct_file_off_t __kernel_off_t
|
||||
# endif
|
||||
/* Up to this commit from 2015-10-12
|
||||
<https://android.googlesource.com/platform/bionic.git/+/f0141dfab10a4b332769d52fa76631a64741297a>
|
||||
@@ -96,7 +98,7 @@
|
||||
unsigned char _nbuf[1]; \
|
||||
struct { unsigned char *_base; size_t _size; } _lb; \
|
||||
int _blksize; \
|
||||
- fpos_t _offset; \
|
||||
+ _gl_struct_file_off_t _offset; \
|
||||
/* More fields, not relevant here. */ \
|
||||
} *) fp)
|
||||
# else
|
|
@ -3,14 +3,16 @@ TERMUX_PKG_DESCRIPTION="typesetting system that reads plain text mixed with form
|
|||
TERMUX_PKG_LICENSE="GPL-3.0"
|
||||
TERMUX_PKG_MAINTAINER="@termux"
|
||||
TERMUX_PKG_VERSION=1.22.4
|
||||
TERMUX_PKG_REVISION=3
|
||||
TERMUX_PKG_REVISION=4
|
||||
TERMUX_PKG_SRCURL=https://ftp.gnu.org/gnu/groff/groff-${TERMUX_PKG_VERSION}.tar.gz
|
||||
TERMUX_PKG_SHA256=e78e7b4cb7dec310849004fa88847c44701e8d133b5d4c13057d876c1bad0293
|
||||
TERMUX_PKG_DEPENDS="libc++, perl, man"
|
||||
TERMUX_PKG_GROUPS="base-devel"
|
||||
TERMUX_PKG_BUILD_IN_SRC=true
|
||||
TERMUX_PKG_HOSTBUILD=true
|
||||
|
||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
|
||||
am_cv_func_iconv=no
|
||||
"
|
||||
TERMUX_PKG_RM_AFTER_INSTALL="
|
||||
bin/soelim
|
||||
share/man/man1/soelim.1*
|
||||
|
|
|
@ -0,0 +1,36 @@
|
|||
--- a/lib/stdio-impl.h
|
||||
+++ b/lib/stdio-impl.h
|
||||
@@ -61,6 +61,13 @@
|
||||
# define _r pub._r
|
||||
# define _w pub._w
|
||||
# elif defined __ANDROID__ /* Android */
|
||||
+# ifdef __LP64__
|
||||
+# define _gl_flags_file_t int
|
||||
+# define _gl_struct_file_off_t int64_t
|
||||
+# else
|
||||
+# define _gl_flags_file_t short
|
||||
+# define _gl_struct_file_off_t __kernel_off_t
|
||||
+# endif
|
||||
/* 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,
|
||||
@@ -70,8 +77,8 @@
|
||||
# define fp_ ((struct { unsigned char *_p; \
|
||||
int _r; \
|
||||
int _w; \
|
||||
- int _flags; \
|
||||
- int _file; \
|
||||
+ _gl_flags_file_t _flags; \
|
||||
+ _gl_flags_file_t _file; \
|
||||
struct { unsigned char *_base; size_t _size; } _bf; \
|
||||
int _lbfsize; \
|
||||
void *_cookie; \
|
||||
@@ -86,7 +93,7 @@
|
||||
unsigned char _nbuf[1]; \
|
||||
struct { unsigned char *_base; size_t _size; } _lb; \
|
||||
int _blksize; \
|
||||
- fpos_t _offset; \
|
||||
+ _gl_struct_file_off_t _offset; \
|
||||
/* More fields, not relevant here. */ \
|
||||
} *) fp)
|
||||
# else
|
|
@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Standard GNU file compression utilities"
|
|||
TERMUX_PKG_LICENSE="GPL-3.0"
|
||||
TERMUX_PKG_MAINTAINER="@termux"
|
||||
TERMUX_PKG_VERSION=1.12
|
||||
TERMUX_PKG_REVISION=1
|
||||
TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/gzip/gzip-${TERMUX_PKG_VERSION}.tar.xz
|
||||
TERMUX_PKG_SHA256=ce5e03e519f637e1f814011ace35c4f87b33c0bbabeec35baf5fbd3479e91956
|
||||
TERMUX_PKG_ESSENTIAL=true
|
||||
|
|
|
@ -0,0 +1,22 @@
|
|||
--- a/lib/stdio-impl.h
|
||||
+++ b/lib/stdio-impl.h
|
||||
@@ -68,8 +68,10 @@
|
||||
# elif defined __ANDROID__ /* Android */
|
||||
# ifdef __LP64__
|
||||
# define _gl_flags_file_t int
|
||||
+# define _gl_struct_file_off_t int64_t
|
||||
# else
|
||||
# define _gl_flags_file_t short
|
||||
+# define _gl_struct_file_off_t __kernel_off_t
|
||||
# endif
|
||||
/* Up to this commit from 2015-10-12
|
||||
<https://android.googlesource.com/platform/bionic.git/+/f0141dfab10a4b332769d52fa76631a64741297a>
|
||||
@@ -96,7 +98,7 @@
|
||||
unsigned char _nbuf[1]; \
|
||||
struct { unsigned char *_base; size_t _size; } _lb; \
|
||||
int _blksize; \
|
||||
- fpos_t _offset; \
|
||||
+ _gl_struct_file_off_t _offset; \
|
||||
/* More fields, not relevant here. */ \
|
||||
} *) fp)
|
||||
# else
|
|
@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="GNU stream editor for filtering/transforming text"
|
|||
TERMUX_PKG_LICENSE="GPL-3.0"
|
||||
TERMUX_PKG_MAINTAINER="@termux"
|
||||
TERMUX_PKG_VERSION=4.8
|
||||
TERMUX_PKG_REVISION=3
|
||||
TERMUX_PKG_REVISION=4
|
||||
TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/sed/sed-${TERMUX_PKG_VERSION}.tar.xz
|
||||
TERMUX_PKG_SHA256=f79b0cfea71b37a8eeec8490db6c5f7ae7719c35587f21edb0617f370eeff633
|
||||
TERMUX_PKG_ESSENTIAL=true
|
||||
|
|
|
@ -0,0 +1,22 @@
|
|||
--- a/lib/stdio-impl.h
|
||||
+++ b/lib/stdio-impl.h
|
||||
@@ -68,8 +68,10 @@
|
||||
# elif defined __ANDROID__ /* Android */
|
||||
# ifdef __LP64__
|
||||
# define _gl_flags_file_t int
|
||||
+# define _gl_struct_file_off_t int64_t
|
||||
# else
|
||||
# define _gl_flags_file_t short
|
||||
+# define _gl_struct_file_off_t __kernel_off_t
|
||||
# endif
|
||||
/* Up to this commit from 2015-10-12
|
||||
<https://android.googlesource.com/platform/bionic.git/+/f0141dfab10a4b332769d52fa76631a64741297a>
|
||||
@@ -96,7 +98,7 @@
|
||||
unsigned char _nbuf[1]; \
|
||||
struct { unsigned char *_base; size_t _size; } _lb; \
|
||||
int _blksize; \
|
||||
- fpos_t _offset; \
|
||||
+ _gl_struct_file_off_t _offset; \
|
||||
/* More fields, not relevant here. */ \
|
||||
} *) fp)
|
||||
# else
|
|
@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="GNU tar for manipulating tar archives"
|
|||
TERMUX_PKG_LICENSE="GPL-3.0"
|
||||
TERMUX_PKG_MAINTAINER="@termux"
|
||||
TERMUX_PKG_VERSION=1.34
|
||||
TERMUX_PKG_REVISION=1
|
||||
TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/tar/tar-${TERMUX_PKG_VERSION}.tar.xz
|
||||
TERMUX_PKG_SHA256=63bebd26879c5e1eea4352f0d03c991f966aeb3ddeb3c7445c902568d5411d28
|
||||
TERMUX_PKG_DEPENDS="libandroid-glob, libiconv"
|
||||
|
|
|
@ -0,0 +1,22 @@
|
|||
--- a/gnu/stdio-impl.h
|
||||
+++ b/gnu/stdio-impl.h
|
||||
@@ -68,8 +68,10 @@
|
||||
# elif defined __ANDROID__ /* Android */
|
||||
# ifdef __LP64__
|
||||
# define _gl_flags_file_t int
|
||||
+# define _gl_struct_file_off_t int64_t
|
||||
# else
|
||||
# define _gl_flags_file_t short
|
||||
+# define _gl_struct_file_off_t __kernel_off_t
|
||||
# endif
|
||||
/* Up to this commit from 2015-10-12
|
||||
<https://android.googlesource.com/platform/bionic.git/+/f0141dfab10a4b332769d52fa76631a64741297a>
|
||||
@@ -96,7 +98,7 @@
|
||||
unsigned char _nbuf[1]; \
|
||||
struct { unsigned char *_base; size_t _size; } _lb; \
|
||||
int _blksize; \
|
||||
- fpos_t _offset; \
|
||||
+ _gl_struct_file_off_t _offset; \
|
||||
/* More fields, not relevant here. */ \
|
||||
} *) fp)
|
||||
# else
|
Loading…
Reference in New Issue