sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

chroot: update patches for 8.31

Browse Source
This commit is contained in:
Henrik Grimler 2019-04-28 12:18:53 +02:00 committed by Yaksh Bariya
parent 4bd1d317a1
commit 0a1e7aebec
No known key found for this signature in database
GPG Key ID: F7486BA7D3D27581
3 changed files with 11 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
root-packages/chroot/build.sh
View File

@ -7,12 +7,14 @@ TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/coreutils/coreutils-${TERMUX_PK
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
gl_cv_host_operating_system=Android
ac_cv_func_getpass=yes
--disable-xattr
--without-gmp
"
termux_step_pre_configure() {
CPPFLAGS+=" -DDEFAULT_TMPDIR=\\\"$TERMUX_PREFIX/tmp\\\""
CPPFLAGS+=" -D__USE_FORTIFY_LEVEL=0"
}
termux_step_make() {
@ -38,6 +40,7 @@ termux_step_make() {
}
termux_step_make_install() {
mkdir -p $TERMUX_PREFIX/share/man/man1
install -Dm700 $TERMUX_PKG_BUILDDIR/src/chroot \
$TERMUX_PREFIX/bin/
install -Dm600 $TERMUX_PKG_SRCDIR/man/chroot.1 \

30
root-packages/chroot/configure.patch
View File

@ -1,25 +1,11 @@
diff -r -u ../coreutils-8.22/configure ./configure
--- ../coreutils-8.22/configure 2013-12-13 16:05:30.000000000 +0100
+++ ./configure 2014-02-12 18:21:28.000000000 +0100
@@ -39537,7 +39537,7 @@
--- ../configure.orig 2019-04-04 22:05:58.910698449 +0200
+++ ./configure 2019-04-04 22:08:58.330693037 +0200
@@ -43326,7 +43326,7 @@
# Determine how to get the list of mounted file systems.
-ac_list_mounted_fs=
+ac_list_mounted_fs=found
# Determine how to get the list of mounted file systems.
- ac_list_mounted_fs=
+ ac_list_mounted_fs=found
# If the getmntent function is available but not in the standard library,
# make sure LIBS contains the appropriate -l option.
@@ -40077,12 +40077,6 @@
esac
fi
-if test -z "$ac_list_mounted_fs"; then
- as_fn_error $? "could not determine how to read list of mounted file systems" "$LINENO" 5
- # FIXME -- no need to abort building the whole package
- # Can't build mountlist.c or anything that needs its functions
-fi
-
if test $ac_list_mounted_fs = found; then :
gl_cv_list_mounted_fs=yes
else
# If the getmntent function is available but not in the standard library,
# make sure LIBS contains the appropriate -l option.

12
root-packages/chroot/lib-stdio-impl.h.patch
View File

@ -1,12 +0,0 @@
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,