On Thu, Sep 11, 2014 at 06:52:23PM -0400, Theodore Ts'o wrote: > On Thu, Sep 11, 2014 at 03:50:22PM -0700, Darrick J. Wong wrote: > > > > Looks like most everything landed ok except for: > > > > Yikes, make check explodes: > > Hmm, works for me. Could you make sure you've done a "make clean" and > also a "git clean"? In particular, make sure you don't have a > leftover file in debugfs/jfs_user.h.... There aren't any stray jfs_user.h files, but rearranging DEBUGFS_CFLAGS seems to fix it. On Ubuntu 14.04 it seems that the compile command for lib/ext2fs/journal.o is: gcc -I. -I../../lib -I../../lib -Wall -g -O2 -fstack-protector --param=ssp-buffer-size=4 -DHAVE_CONFIG_H -I./../../e2fsck -DDEBUGFS -c ../../debugfs/journal.c -o journal.o ...which means that it picks up lib/ext2fs/jfs_user.h instead of the one in e2fsck/. The attached patch changes it to: gcc -I./../../e2fsck -I. -I../../lib -I../../lib -Wall -g -O2 -fstack-protector --param=ssp-buffer-size=4 -DHAVE_CONFIG_H -DDEBUGFS -c ../../debugfs/journal.c -o journal.o ...which runs the compile ok. --D diff --git a/lib/ext2fs/Makefile.in b/lib/ext2fs/Makefile.in index 597bed6..bc0dc8a 100644 --- a/lib/ext2fs/Makefile.in +++ b/lib/ext2fs/Makefile.in @@ -7,7 +7,7 @@ INSTALL = @INSTALL@ DEPEND_CFLAGS = -I$(top_srcdir)/debugfs -I$(srcdir)/../../e2fsck -DDEBUGFS # This nastyness is needed because of jfs_user.h hackery; when we finally # clean up this mess, we should be able to drop it -DEBUGFS_CFLAGS = $(ALL_CFLAGS) -I$(srcdir)/../../e2fsck -DDEBUGFS +DEBUGFS_CFLAGS = -I$(srcdir)/../../e2fsck $(ALL_CFLAGS) -DDEBUGFS @MCONFIG@ -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
