Date: Wed, 14 Jan 2015 16:40:41 -0700 From: Warner Losh <imp@bsdimp.com> To: Matthias Andree <mandree@FreeBSD.org> Cc: "Ted Y. Ts'o" <tytso@mit.edu>, current@freebsd.org Subject: Re: What happened to DIOCGDINFO? Fwd: [package - head-amd64-default][misc/e2fsprogs-libblkid] Failed for e2fsprogs-libblkid-1.42.12 in build Message-ID: <4ED48B09-3AF6-44EE-8EC6-467E9DD2E51E@bsdimp.com> In-Reply-To: <54B26782.9010403@FreeBSD.org> References: <201501101948.t0AJmqqP067320@beefy2.isc.freebsd.org> <54B1D848.3090800@FreeBSD.org> <1420945507.14601.142.camel@freebsd.org> <54B26782.9010403@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--Apple-Mail=_3C383C90-7BAF-4BCB-9533-9922D01794AC Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=windows-1252 > On Jan 11, 2015, at 5:07 AM, Matthias Andree <mandree@FreeBSD.org> = wrote: >=20 > Am 11.01.2015 um 04:05 schrieb Ian Lepore: >=20 >>>> Ident: $FreeBSD: head/misc/e2fsprogs-libblkid/Makefile = 370388 2014-10-07 19:15:52Z mandree $ >>>> Log URL: = http://beefy2.isc.freebsd.org/data/head-amd64-default/2015-01-10_14h05m40s= /logs/e2fsprogs-libblkid-1.42.12.log >>>> Build URL: = http://beefy2.isc.freebsd.org/build.html?mastername=3Dhead-amd64-default&b= uild=3D2015-01-10_14h05m40s >>>> Log: >>>=20 >>>> cc -I. -I../../lib -I../../lib = -I/wrkdirs/usr/ports/misc/e2fsprogs-libblkid/work/e2fsprogs-1.42.12/lib = -I/usr/local/include -D_THREAD_SAFE -O2 -pipe -fstack-protector = -fno-strict-aliasing -std=3Dgnu99 -DHAVE_CONFIG_H -c getsize.c -o = getsize.o >>>> getsize.c:151:31: error: use of undeclared identifier 'DIOCGDINFO' >>>> if (part >=3D 0 && (ioctl(fd, DIOCGDINFO, (char = *)&lab) >=3D 0)) { >>>> ^ >>>> 1 error generated. >=20 >> It was removed in r276737. I don't know what replaces it. >=20 > Ted, >=20 > I am including a patch against e2fsprogs's "maint" branch to fix the > build on the future FreeBSD 11+ versions. Please apply. >=20 >=20 > Ian, Warner, *, >=20 > I think I've got a hold of this; the replacement appears to be > DIOCGMEDIASIZE from <sys/disk.h>, and has been for more than a decade, > so that I had forgotten about it. >=20 > The e2fsprogs port has been using DIOCGMEDIASIZE for many years (phk > added DIOCGMEDIASIZE on 2002-04-08, I added upstream support = 2003-12-28 > but it underwent a few revisions, not worth bothering IMO) judging = from > the source code comments, but one of the two getsize.c source files - > the one in lib/blkid/ - lacks an #ifdef DIOCGDINFO guard and relies on > #ifdef HAVE_SYS_DISKLABEL_H only and jams the build. The other one in > lib/ext2fs/ had a guard that checked the actual ioctl #define. >=20 > Fix has been committed without Git markup in the FreeBSD ports tree, > r376742. These changes look good to me. Warner --Apple-Mail=_3C383C90-7BAF-4BCB-9533-9922D01794AC Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJUtv55AAoJEGwc0Sh9sBEA3NIQAIr/8CRRg7dxt2cXsTLz9d0i N6LAf/pgCY4TjrWYjrTlu/1iUNQEf/CvRcpOEs/wSUTF2lGdCOvT4JPurWg49zQ3 8yRWSJKX9j+RZLSNL14ScOhpKJ06OSBb6hdM95nggsrZu8t9OvrVQJU98RQ6SHve WSxW1OSYfG6LIMXEHAUNRDFc5GNv8iCNn+PTGz6m3O+Anvku97BP+6ac8BLiLYDJ PQM7+DAupsyOvpkYiTDbOvfBhn/TWo81gXMdZlXPGbMvShyRbonO0Q5Ery098meo XN0vcZ9uH4X8reQThUVuKPZUC0JhFGUYK05mzjmhOpf4uqkRT37DmvIhoHLygYhc xjGzeN25UbuhnT2uSP8gSOfMOUBoNf1VM3zv5vcLREeRF2Ht4RNUyJEBybiYRDHu 9aYlVSPdHw8hR3WtQFD7mknYJed668k38dW9gpPGrzs2qCfVV6EjRC9XZ9R1Shx3 bIkQrR73iayZehVq6u6bQY3dVS/FKiKBJ99OFdy2kGxQfAEDcFaYGJmnVf6kWTdR /xic7PEoYBsD6mxFvlFn7NpdcKbyqRRuLrkD4GkuIZOWHO4OZrlMa55p0HNAzLVN sCh+3aYQmQYJeupWg/0RIjHV9/UYTJQZqU6MDu51M8chSVlHxckprbuF0eycSzQg TEhhDZdLDLEyo6CGnfh+ =PxCP -----END PGP SIGNATURE----- --Apple-Mail=_3C383C90-7BAF-4BCB-9533-9922D01794AC--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4ED48B09-3AF6-44EE-8EC6-467E9DD2E51E>