Re: What happened to DIOCGDINFO? Fwd: [package - head-amd64-default][misc/e2fsprogs-libblkid] Failed for e2fsprogs-libblkid-1.42.12 in build

> On Jan 11, 2015, at 5:07 AM, Matthias Andree <mandree_at_FreeBSD.org> wrote:
> 
> Am 11.01.2015 um 04:05 schrieb Ian Lepore:
> 
>>>> 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=head-amd64-default&build=2015-01-10_14h05m40s
>>>> Log:
>>> 
>>>> 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=gnu99 -DHAVE_CONFIG_H -c getsize.c -o getsize.o
>>>> getsize.c:151:31: error: use of undeclared identifier 'DIOCGDINFO'
>>>>                if (part >= 0 && (ioctl(fd, DIOCGDINFO, (char *)&lab) >= 0)) {
>>>>                                            ^
>>>> 1 error generated.
> 
>> It was removed in r276737.  I don't know what replaces it.
> 
> Ted,
> 
> I am including a patch against e2fsprogs's "maint" branch to fix the
> build on the future FreeBSD 11+ versions. Please apply.
> 
> 
> Ian, Warner, *,
> 
> 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.
> 
> 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.
> 
> Fix has been committed without Git markup in the FreeBSD ports tree,
> r376742.

These changes look good to me.

Warner