linux-btrfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] btrfs-progs: fix parallel build
@ 2013-01-31 12:50 David Sterba
  2013-01-31 15:32 ` Eric Sandeen
  0 siblings, 1 reply; 3+ messages in thread
From: David Sterba @ 2013-01-31 12:50 UTC (permalink / raw)
  To: linux-btrfs; +Cc: David Sterba

Parallel build may fail due to late creation of version.h, fix the rule name
that does not match the filename.

Signed-off-by: David Sterba <dsterba@suse.cz>
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 6df402c..bef1e13 100644
--- a/Makefile
+++ b/Makefile
@@ -52,9 +52,9 @@ endif
 	$(Q)$(CC) $(DEPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c $<
 
 
-all: version $(progs) manpages
+all: version.h $(progs) manpages
 
-version:
+version.h:
 	$(Q)bash version.sh
 
 btrfs: $(objects) btrfs.o help.o $(cmds_objects)
-- 
1.8.0.2


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] btrfs-progs: fix parallel build
  2013-01-31 12:50 [PATCH] btrfs-progs: fix parallel build David Sterba
@ 2013-01-31 15:32 ` Eric Sandeen
  0 siblings, 0 replies; 3+ messages in thread
From: Eric Sandeen @ 2013-01-31 15:32 UTC (permalink / raw)
  To: David Sterba; +Cc: linux-btrfs

On 1/31/13 6:50 AM, David Sterba wrote:
> Parallel build may fail due to late creation of version.h, fix the rule name
> that does not match the filename.
> 
> Signed-off-by: David Sterba <dsterba@suse.cz>

Look good, thanks.  surprised I didn't run into this.

Reviewed-by: Eri Sandeen <sandeen@redhat.com>
> ---
>  Makefile | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index 6df402c..bef1e13 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -52,9 +52,9 @@ endif
>  	$(Q)$(CC) $(DEPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c $<
>  
>  
> -all: version $(progs) manpages
> +all: version.h $(progs) manpages
>  
> -version:
> +version.h:
>  	$(Q)bash version.sh
>  
>  btrfs: $(objects) btrfs.o help.o $(cmds_objects)
> 


^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH] btrfs-progs: fix parallel build
@ 2013-09-03  1:52 rongqing.li
  0 siblings, 0 replies; 3+ messages in thread
From: rongqing.li @ 2013-09-03  1:52 UTC (permalink / raw)
  To: linux-btrfs

From: "Roy.Li" <rongqing.li@windriver.com>

Parallel execution of "make install" may fail due to late creation of
version.h, fix it by adding the dependence on version.h.

The fix is similar to 7aaf00fc[btrfs-progs: fix parallel build]

Signed-off-by: Roy.Li <rongqing.li@windriver.com>
---
 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index c43cb68..40ef205 100644
--- a/Makefile
+++ b/Makefile
@@ -190,7 +190,7 @@ clean :
 	      $(libs) $(lib_links)
 	$(Q)$(MAKE) $(MAKEOPTS) -C man $@
 
-install: $(libs) $(progs) install-man
+install: version.h $(libs) $(progs) install-man
 	$(INSTALL) -m755 -d $(DESTDIR)$(bindir)
 	$(INSTALL) $(progs) $(DESTDIR)$(bindir)
 	$(INSTALL) -m755 -d $(DESTDIR)$(libdir)
-- 
1.7.10.4


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2013-09-03  1:52 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-31 12:50 [PATCH] btrfs-progs: fix parallel build David Sterba
2013-01-31 15:32 ` Eric Sandeen
  -- strict thread matches above, loose matches on Subject: below --
2013-09-03  1:52 rongqing.li

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).