[PATCH] Support for FreeMiNT

[Alan Hourihane <alanh@xxxxxxxxxxxxxx>]

Hi all,

Attached is a patch to util-linux-2.18 that's detailed in a gentoo bug
report at....

https://bugs.gentoo.org/show_bug.cgi?id=350340

I believe the solaris part has already been dealt with.

Let me know of any problems and I'll fix up asap.

Thanks,

Alan.

--- shlibs/mount/src/utils.c.old	2010-12-31 18:54:10.000000000 +0000
+++ shlibs/mount/src/utils.c	2010-12-31 17:17:40.000000000 +0000
@@ -298,7 +298,11 @@
 {
         struct passwd pwd;
 	struct passwd *res;
+#ifdef _SC_GETPW_R_SIZE_MAX
 	size_t sz = sysconf(_SC_GETPW_R_SIZE_MAX);
+#else
+	size_t sz = 0;
+#endif
 	char *buf, *username = NULL;
 
 	if (sz <= 0)
--- shlibs/blkid/src/topology/ioctl.c.old	2010-12-31 13:52:41.000000000 +0000
+++ shlibs/blkid/src/topology/ioctl.c	2010-12-31 13:53:11.000000000 +0000
@@ -22,6 +22,7 @@
 /*
  * ioctl topology values
  */
+#ifndef __MINT__
 static struct topology_val {
 
 	long  ioc;
@@ -37,9 +38,11 @@
 	{ BLKPBSZGET, blkid_topology_set_physical_sector_size }
 	/* we read BLKSSZGET in topology.c */
 };
+#endif
 
 static int probe_ioctl_tp(blkid_probe pr, const struct blkid_idmag *mag)
 {
+#ifndef __MINT__
 	int i;
 
 	for (i = 0; i < ARRAY_SIZE(topology_vals); i++) {
@@ -62,6 +65,7 @@
 nothing:
 	return 1;
 err:
+#endif
 	return -1;
 }
 
--- shlibs/blkid/src/topology/md.c.old	2010-12-31 13:53:57.000000000 +0000
+++ shlibs/blkid/src/topology/md.c	2010-12-31 13:54:51.000000000 +0000
@@ -89,6 +89,7 @@
 	dev_t devno = blkid_probe_get_devno(pr);
 	struct md_array_info md;
 
+#ifndef __MINT__
 	if (!devno)
 		goto nothing;		/* probably not a block device */
 
@@ -145,6 +146,7 @@
 	blkid_topology_set_optimal_io_size(pr, md.chunk_size * md.raid_disks);
 
 	return 0;
+#endif
 
 nothing:
 	if (fd != -1 && fd != pr->fd)
--- shlibs/blkid/src/topology/evms.c.old	2010-12-31 13:55:27.000000000 +0000
+++ shlibs/blkid/src/topology/evms.c	2010-12-31 13:55:42.000000000 +0000
@@ -57,6 +57,7 @@
 	struct evms_stripe_info evms;
 	dev_t devno = blkid_probe_get_devno(pr);
 
+#ifndef __MINT__
 	if (!devno)
 		goto nothing;		/* probably not a block device */
 
@@ -72,6 +73,7 @@
 	blkid_topology_set_optimal_io_size(pr, (evms.size * evms.width) << 9);
 
 	return 0;
+#endif
 
 nothing:
 	return 1;