2008-02-14 18:26:14

by Eric Sandeen

[permalink] [raw]
Subject: [PATCH] building e2fsprogs-interim

I needed this patch to build e2fsprogs-interim, to fix a parallel make problem

Signed-off-by: Eric Sandeen <[email protected]>
---

Index: e2fsprogs-1.40.6/lib/ext2fs/Makefile.in
===================================================================
--- e2fsprogs-1.40.6.orig/lib/ext2fs/Makefile.in
+++ e2fsprogs-1.40.6/lib/ext2fs/Makefile.in
@@ -518,7 +518,7 @@ mkdir.o: $(srcdir)/mkdir.c $(srcdir)/ext
$(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \
$(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
$(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h
-mmp.o: $(srcdir)/ext2_fs.h $(srcdir)/ext2fs.h
+mmp.o: $(srcdir)/ext2_fs.h $(srcdir)/ext2fs.h $(top_builddir)/lib/ext2fs/ext2_err.h
mkjournal.o: $(srcdir)/mkjournal.c $(srcdir)/ext2_fs.h \
$(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/e2p/e2p.h \
$(srcdir)/ext2_fs.h $(srcdir)/ext2fs.h $(srcdir)/ext3_extents.h \


2008-02-14 22:47:09

by Andreas Dilger

[permalink] [raw]
Subject: Re: [PATCH] building e2fsprogs-interim

On Feb 14, 2008 12:26 -0600, Eric Sandeen wrote:
> I needed this patch to build e2fsprogs-interim, to fix a parallel make problem

Thanks, I've added to our CVS in case we ever have to re-submit the patch.

> Signed-off-by: Eric Sandeen <[email protected]>
> ---
>
> Index: e2fsprogs-1.40.6/lib/ext2fs/Makefile.in
> ===================================================================
> --- e2fsprogs-1.40.6.orig/lib/ext2fs/Makefile.in
> +++ e2fsprogs-1.40.6/lib/ext2fs/Makefile.in
> @@ -518,7 +518,7 @@ mkdir.o: $(srcdir)/mkdir.c $(srcdir)/ext
> $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \
> $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
> $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h
> -mmp.o: $(srcdir)/ext2_fs.h $(srcdir)/ext2fs.h
> +mmp.o: $(srcdir)/ext2_fs.h $(srcdir)/ext2fs.h $(top_builddir)/lib/ext2fs/ext2_err.h
> mkjournal.o: $(srcdir)/mkjournal.c $(srcdir)/ext2_fs.h \
> $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/e2p/e2p.h \
> $(srcdir)/ext2_fs.h $(srcdir)/ext2fs.h $(srcdir)/ext3_extents.h \
>
>
> -
> To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html

Cheers, Andreas
--
Andreas Dilger
Sr. Staff Engineer, Lustre Group
Sun Microsystems of Canada, Inc.

2008-02-15 19:01:35

by Eric Sandeen

[permalink] [raw]
Subject: Re: [PATCH] UPDATED: building e2fsprogs-interim

Eric Sandeen wrote:

> I needed this patch to build e2fsprogs-interim, to fix a parallel make problem
>
> Signed-off-by: Eric Sandeen <[email protected]>
> ---
>
>
>
An update; running through the whole fedora build turned up another
one (csum.o). Out of curiosity do things like ext2_fs.h (which are not
generated) really need to be listed as dependencies?

Signed-off-by: Eric Sandeen <[email protected]>

---

Index: e2fsprogs-git/e2fsprogs/lib/ext2fs/Makefile.in
===================================================================
--- e2fsprogs-git.orig/e2fsprogs/lib/ext2fs/Makefile.in
+++ e2fsprogs-git/e2fsprogs/lib/ext2fs/Makefile.in
@@ -390,8 +390,8 @@ crc16.o: $(srcdir)/crc16.c $(srcdir)/ext
$(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h $(srcdir)/ext2_fs.h
crc32.o: $(srcdir)/crc32.c $(srcdir)/ext2_fs.h $(srcdir)/crc16.h \
$(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h $(srcdir)/ext2_fs.h
-csum.o: $(srcdir)/csum.c $(srcdir)/ext2_fs.h \
- $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h $(srcdir)/ext2_fs.h
+csum.o: $(srcdir)/csum.c $(srcdir)/ext2_fs.h $(srcdir)/ext2fs.h \
+ $(top_builddir)/lib/ext2fs/ext2_types.h $(top_builddir)/lib/ext2fs/ext2_err.h
dblist.o: $(srcdir)/dblist.c $(srcdir)/ext2_fs.h \
$(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fsP.h \
$(srcdir)/ext2fs.h $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h \
@@ -518,7 +518,8 @@ mkdir.o: $(srcdir)/mkdir.c $(srcdir)/ext
$(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \
$(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
$(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h
-mmp.o: $(srcdir)/ext2_fs.h $(srcdir)/ext2fs.h
+mmp.o: $(srcdir)/ext2_fs.h $(srcdir)/ext2fs.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h
mkjournal.o: $(srcdir)/mkjournal.c $(srcdir)/ext2_fs.h \
$(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/e2p/e2p.h \
$(srcdir)/ext2_fs.h $(srcdir)/ext2fs.h $(srcdir)/ext3_extents.h \

2008-02-16 06:17:54

by Theodore Ts'o

[permalink] [raw]
Subject: Re: [PATCH] UPDATED: building e2fsprogs-interim

On Fri, Feb 15, 2008 at 01:01:28PM -0600, Eric Sandeen wrote:
> An update; running through the whole fedora build turned up another
> one (csum.o). Out of curiosity do things like ext2_fs.h (which are not
> generated) really need to be listed as dependencies?

Well, in an RPM build you probably don't need them, no.

But they are useful in an developer tree because if ext2_fs.h gets
modified, it's good to recompile all source files that include it ---
just to make sure any errors in the header file get caught.

- Ted