2008-06-13 19:04:09

by Jose R. Santos

Subject: [PATCH]e2fsprogs: Fix broken "make check"

Commit: 51d12cebb61ca00f5455fe6e25938cd79fea15ab in pu fails to build
"make check".

Signed-off-by: Jose R. Santos <[email protected]>
---

e2fsck/Makefile.in | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/e2fsck/Makefile.in b/e2fsck/Makefile.in
index 32743bc..0186112 100644
--- a/e2fsck/Makefile.in
+++ b/e2fsck/Makefile.in
@@ -143,12 +143,12 @@ tst_crc32: $(srcdir)/crc32.c $(LIBEXT2FS)
tst_refcount: ea_refcount.c
@echo " LD $@"
@$(CC) -o tst_refcount $(srcdir)/ea_refcount.c \
- $(ALL_CFLAGS) -DTEST_PROGRAM -lcom_err
+ $(ALL_CFLAGS) -DTEST_PROGRAM -L$(LIB) -lcom_err

tst_region: region.c
@echo " LD $@"
@$(CC) -o tst_region $(srcdir)/region.c \
- $(ALL_CFLAGS) -DTEST_PROGRAM -lcom_err
+ $(ALL_CFLAGS) -DTEST_PROGRAM -L$(LIB) -lcom_err

check:: tst_refcount tst_region tst_crc32
./tst_refcount

2008-06-18 21:18:09

by Eric Sandeen

Subject: Re: [PATCH]e2fsprogs: Fix broken "make check"

Jose R. Santos wrote:
> Commit: 51d12cebb61ca00f5455fe6e25938cd79fea15ab in pu fails to build
> "make check".

ACK :)

I put this into the fedora build, thanks.

-Eric

> Signed-off-by: Jose R. Santos <[email protected]>
> ---
>
> e2fsck/Makefile.in | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/e2fsck/Makefile.in b/e2fsck/Makefile.in
> index 32743bc..0186112 100644
> --- a/e2fsck/Makefile.in
> +++ b/e2fsck/Makefile.in
> @@ -143,12 +143,12 @@ tst_crc32: $(srcdir)/crc32.c $(LIBEXT2FS)
> tst_refcount: ea_refcount.c
> @echo " LD $@"
> @$(CC) -o tst_refcount $(srcdir)/ea_refcount.c \
> - $(ALL_CFLAGS) -DTEST_PROGRAM -lcom_err
> + $(ALL_CFLAGS) -DTEST_PROGRAM -L$(LIB) -lcom_err
>
> tst_region: region.c
> @echo " LD $@"
> @$(CC) -o tst_region $(srcdir)/region.c \
> - $(ALL_CFLAGS) -DTEST_PROGRAM -lcom_err
> + $(ALL_CFLAGS) -DTEST_PROGRAM -L$(LIB) -lcom_err
>
> check:: tst_refcount tst_region tst_crc32
> ./tst_refcount
> --
> 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

2008-06-19 14:29:14

by Theodore Ts'o

Subject: Re: [PATCH]e2fsprogs: Fix broken "make check"

On Fri, Jun 13, 2008 at 02:04:01PM -0500, Jose R. Santos wrote:
> Commit: 51d12cebb61ca00f5455fe6e25938cd79fea15ab in pu fails to build
> "make check".
>
> Signed-off-by: Jose R. Santos <[email protected]>

Thanks for reporting this, although the cleaner and better way to fix
this is as follows:

- Ted

>From 6f2ca692ecb993c23aabfcf3bb44376a03394cc0 Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <[email protected]>
Date: Thu, 19 Jun 2008 10:09:08 -0400
Subject: [PATCH] Fix "make check" in e2fsck subdirectory to use the in-tree com_err library

Thanks to Jose Santos for pointing this out

Signed-off-by: "Theodore Ts'o" <[email protected]>
---
e2fsck/Makefile.in | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/e2fsck/Makefile.in b/e2fsck/Makefile.in
index 32743bc..9b32a61 100644
--- a/e2fsck/Makefile.in
+++ b/e2fsck/Makefile.in
@@ -143,12 +143,12 @@ tst_crc32: $(srcdir)/crc32.c $(LIBEXT2FS)
tst_refcount: ea_refcount.c
@echo " LD $@"
@$(CC) -o tst_refcount $(srcdir)/ea_refcount.c \
- $(ALL_CFLAGS) -DTEST_PROGRAM -lcom_err
+ $(ALL_CFLAGS) -DTEST_PROGRAM $(LIBCOM_ERR)

tst_region: region.c
@echo " LD $@"
@$(CC) -o tst_region $(srcdir)/region.c \
- $(ALL_CFLAGS) -DTEST_PROGRAM -lcom_err
+ $(ALL_CFLAGS) -DTEST_PROGRAM $(LIBCOM_ERR)

check:: tst_refcount tst_region tst_crc32
./tst_refcount
--
1.5.6.rc3.1.g36b7.dirty