Browse Source

util-linux: Fix building with unified headers

android-5
Fredrik Fornwall 8 years ago
parent
commit
f019ac1126
  1. 1
      packages/util-linux/build.sh
  2. 12
      packages/util-linux/lib-ismounted.c.patch

1
packages/util-linux/build.sh

@ -18,6 +18,7 @@ ac_cv_func_unshare=yes
--disable-pivot_root
--disable-switch_root
--disable-wall
--disable-libmount
"
# bin/column is currently bundled in the fish package:
TERMUX_PKG_RM_AFTER_INSTALL="bin/column share/man/man1/column.1"

12
packages/util-linux/lib-ismounted.c.patch

@ -0,0 +1,12 @@
diff -u -r ../util-linux-2.29.2/lib/ismounted.c ./lib/ismounted.c
--- ../util-linux-2.29.2/lib/ismounted.c 2017-02-22 11:16:55.241092792 +0100
+++ ./lib/ismounted.c 2017-06-29 00:29:03.385122232 +0200
@@ -143,7 +143,7 @@
#endif /* __GNU__ */
*mount_flags = MF_MOUNTED;
-#ifdef MNTOPT_RO
+#if defined(MNTOPT_RO) && !defined(__ANDROID__)
/* Check to see if the ro option is set */
if (hasmntopt(mnt, MNTOPT_RO))
*mount_flags |= MF_READONLY;
Loading…
Cancel
Save