On Mon, May 28, 2018 at 11:16:17PM +0200, Andreas Henriksson wrote:
> As Svante mentioned it will not work because GNU/Hurd does not provide
> the linuxish mount() interface (which is about to change, btw ;)
> The attached patch fixes the build.
>
> Samuel
>
> diff --git a/libmount/src/libmount.h.in b/libmount/src/libmount.h.in
> index 11fd759fa..39568a37c 100644
> --- a/libmount/src/libmount.h.in
> +++ b/libmount/src/libmount.h.in
> @@ -34,7 +34,9 @@ extern "C" {
> * don't want to include sys/mount.h at all to avoid collisions.
> */
> #ifndef MS_RDONLY
> -# include <sys/mount.h>
> +# ifdef HAVE_SYS_MOUNT_H
> +# include <sys/mount.h>
> +# endif
> #endif
I have doubts we can use HAVE_* here, because the file is public
library interface and HAVE_* are available in util-linux build tree
only. I have applied another bugfix:
diff --git a/libmount/src/libmount.h.in b/libmount/src/libmount.h.in
index 11fd759fa..c61514b59 100644
--- a/libmount/src/libmount.h.in
+++ b/libmount/src/libmount.h.in
@@ -33,7 +33,7 @@ extern "C" {
* may be already defined by linux/fs.h or another file -- in this case we
* don't want to include sys/mount.h at all to avoid collisions.
*/
-#ifndef MS_RDONLY
+#if defined(__linux__) && !defined(MS_RDONLY)
# include <sys/mount.h>
#endif
Hope this bugfix (from "Typical Redhat people") will work for Svante
too :)
Karel
--
Karel Zak <kzak@xxxxxxxxxx>
http://karelzak.blogspot.com
--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
