From f019ac112650a0203b719e6735bcbcc51eafdbd2 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Thu, 29 Jun 2017 01:06:34 +0200
Subject: [PATCH 1/1] util-linux: Fix building with unified headers

---
 packages/util-linux/build.sh              |  1 +
 packages/util-linux/lib-ismounted.c.patch | 12 ++++++++++++
 2 files changed, 13 insertions(+)
 create mode 100644 packages/util-linux/lib-ismounted.c.patch

diff --git a/packages/util-linux/build.sh b/packages/util-linux/build.sh
index 9000b48a..aaac78c8 100644
--- a/packages/util-linux/build.sh
+++ b/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"
diff --git a/packages/util-linux/lib-ismounted.c.patch b/packages/util-linux/lib-ismounted.c.patch
new file mode 100644
index 00000000..8d8cbfae
--- /dev/null
+++ b/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;
-- 
2.11.0