public inbox for linux-xfs@vger.kernel.org
 help / color / mirror / Atom feed
From: Dave Chinner <david@fromorbit.com>
To: Christoph Hellwig <hch@lst.de>
Cc: xfs@oss.sgi.com
Subject: Re: [PATCH 06/10] xfsprogs: use <>-style includes in installed headers
Date: Fri, 31 Jul 2015 12:55:06 +1000	[thread overview]
Message-ID: <20150731025506.GP16638@dastard> (raw)
In-Reply-To: <1437927209-31354-7-git-send-email-hch@lst.de>

On Sun, Jul 26, 2015 at 06:13:25PM +0200, Christoph Hellwig wrote:
> Once installed these are system headers, so we need to use <>-style include
> statements between them.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>

This causes a build failure on my system when doing a parallel
build. For some reason, make is trying to install libxfs headers
before the include headers, and fails because include/xfs doesn't
yet exist.

.....
config.status: executing libtool commands
   [HEADERS] libxfs
   [HEADERS] include
ln: failed to create symbolic link ¿../include/xfs/xfs_fs.h¿: No such file or directory
Makefile:141: recipe for target 'xfs_fs.h-hdrs' failed
....

I made a small change to pull the creation of include/xfs out of
include/Makefile and up into include/buildrules where it is done
before running the install-headers rule on each header subdir,
and that fixes it. i.e:

diff --git a/include/Makefile b/include/Makefile
index bd8b0ca..705090a 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -67,12 +67,9 @@ include $(BUILDRULES)
 # set up include/xfs header directory
 install-headers: $(addsuffix -hdrs, $(HFILES) $(PHFILES) $(DKHFILES) $(LIBHFILES))

-%-hdrs: xfs
+%-hdrs:
        $(Q)$(LN_S) -f $(PWD)/include/$* xfs/$*

-xfs:
-       @mkdir -p xfs
-
 install: default
        $(INSTALL) -m 755 -d $(PKG_INC_DIR)

diff --git a/include/buildrules b/include/buildrules
index 72491db..1ece843 100644
--- a/include/buildrules
+++ b/include/buildrules
@@ -14,10 +14,16 @@ clean clobber : $(addsuffix -clean,$(SUBDIRS))
        $(Q)$(MAKE) $(MAKEOPTS) -C $* clean

 ifdef HDR_SUBDIRS
-headers: $(addsuffix -headers, $(HDR_SUBDIRS))
+.PHONY: .xfs
+
+headers: .xfs $(addsuffix -headers, $(HDR_SUBDIRS))
+
 %-headers:
        @echo "   [HEADERS] $*"
        $(Q)$(MAKE) $(MAKEOPTS) -C $* NODEP=1 install-headers
+
+.xfs:
+       @mkdir -p include/xfs
 endif

 # Never blow away subdirs


Now I've just got to work out which patch is breaking 'make deb'....

Cheers,

Dave.
-- 
Dave Chinner
david@fromorbit.com

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

  reply	other threads:[~2015-07-31  2:55 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-26 16:13 xfsprogs: fix and clean up installed headers V2 Christoph Hellwig
2015-07-26 16:13 ` [PATCH 01/10] xfsprogs: don't install internal header files Christoph Hellwig
2015-07-26 16:13 ` [PATCH 02/10] xfsprogs: remove unused macros from xfs_arch.h Christoph Hellwig
2015-07-26 16:13 ` [PATCH 03/10] xfsprogs: remove swab.h Christoph Hellwig
2015-07-26 16:13 ` [PATCH 04/10] xfsprogs: only install *format.h headers in install-qa Christoph Hellwig
2015-07-26 16:13 ` [PATCH 05/10] xfsprogs: remove install-qa target Christoph Hellwig
2015-07-26 16:13 ` [PATCH 06/10] xfsprogs: use <>-style includes in installed headers Christoph Hellwig
2015-07-31  2:55   ` Dave Chinner [this message]
2015-07-31  8:09     ` Christoph Hellwig
2015-07-31 22:44       ` [PATCH] build: create include/xfs before installing headers (was Re: [PATCH 06/10] xfsprogs: use <>-style includes in installed headers) Dave Chinner
2015-07-26 16:13 ` [PATCH 07/10] xfsprogs: simplify internal includes Christoph Hellwig
2015-07-26 16:13 ` [PATCH 08/10] xfsprogs: move __be*/__le* types and __arch_pack to xfs_arch.h Christoph Hellwig
2015-07-26 16:13 ` [PATCH 09/10] xfsprogs: move __u*/__s* typedefs to per-port headers Christoph Hellwig
2015-07-26 16:13 ` [PATCH 10/10] xfsprogs: don't install platform_defs.h Christoph Hellwig

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150731025506.GP16638@dastard \
    --to=david@fromorbit.com \
    --cc=hch@lst.de \
    --cc=xfs@oss.sgi.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox