Re: xfsprogs for-next build error on Debian Wheezy / amd64

Christoph Hellwig
2015-06-17T10:31:32Z

On Wed, Jun 10, 2015 at 07:19:52PM +1000, Dave Chinner wrote:
> On Wed, Jun 10, 2015 at 01:40:43AM -0700, Christoph Hellwig wrote:
> > Here is the fix. Since that commit the build accidentally relied on the
> > installed platform_defs.h:
> >
> > ---
> > From e406bcdcdad80ca491d5b854cde5ad893bef6f8c Mon Sep 17 00:00:00 2001
> > From: Christoph Hellwig <hch@lst.de>
> > Date: Wed, 10 Jun 2015 10:34:45 +0200
> > Subject: xfsprogs: fix platform_defs.h include path
> > MIME-Version: 1.0
> > Content-Type: text/plain; charset=UTF-8
> > Content-Transfer-Encoding: 8bit
> >
> > Since 2fe8a2 ("libxfs: restructure to match kernel layout") platform_defs.h
> > the xfs subdirectory under include/ only contains selected headers instead
> > of being a directory symlink.
> >
> > Because of this the build does not properly pick up platform_defs.h, which
> > isn't symlinked into include/xfs. Builds only work if a recent enough
> > platform_defs.h is available under /usr/include/xfs.
> >
> > Fix this by including platform_defs.h without the xfs/ prefix.
>
> Actually, I think that platform_defs.h needs to be symlinked into
> include/xfs. that was the intent, but I bet I missed it because
> the build wasn't failing and so I didn't notice that I'd failed to
> put it into the the include/Makefile rule for installed headers.
>
> Yeah, there we are - the install-dev rule has a specific install
> rule for platform_defs.h as well, so it was being included in the
> package builds correctly (i.e. installed in /usr/include/xfs)
> without being mentioned in the HFILES definition that defines header
> files to be packaged for /usr/include/xfs....
>
> Patch below (which uncovers another issue to do with include files
> on the distclean side, but is not fatal and I'll fix tomorrow).

Can you apply this one to get the build back working? I have
another large one to deal with splitting the generated files on top of
it.

Reviewed-by: Christoph Hellwig <hch@lst.de>