2016-05-06 23:40:10

by Filipe Brandenburger

Subject: [PATCH e2fsprogs] Apply LDFLAGS when building tests in lib/e2p

This was previously addressed by Michael Forney on commit 53904ae543591a
but it seems the test cases from lib/e2p (tst_ostype and tst_feature)
were missed.

Fix them by adding the same $(ALL_LDFLAGS) to those two targets.

Tested by building it on a system that depends on LDFLAGS to produce
working binaries and confirming that `make check` succeeds.

Reported-by: Eric Christopher <[email protected]>
Signed-off-by: Filipe Brandenburger <[email protected]>
---
lib/e2p/Makefile.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/e2p/Makefile.in b/lib/e2p/Makefile.in
index 83f04ff5c04e..d109bf190051 100644
--- a/lib/e2p/Makefile.in
+++ b/lib/e2p/Makefile.in
@@ -68,12 +68,12 @@ e2p.pc: $(srcdir)/e2p.pc.in $(top_builddir)/config.status
tst_ostype: $(srcdir)/ostype.c
$(E) " LD $@"
$(Q) $(CC) -DTEST_PROGRAM -I$(top_srcdir)/lib -o tst_ostype \
- $(srcdir)/ostype.c $(ALL_CFLAGS)
+ $(srcdir)/ostype.c $(ALL_CFLAGS) $(ALL_LDFLAGS)

tst_feature: $(srcdir)/feature.c
$(E) " LD $@"
$(Q) $(CC) -DTEST_PROGRAM -I$(top_srcdir)/lib -o tst_feature \
- $(srcdir)/feature.c $(ALL_CFLAGS)
+ $(srcdir)/feature.c $(ALL_CFLAGS) $(ALL_LDFLAGS)

check:: tst_ostype tst_feature
./tst_ostype
--
2.8.0.rc3.226.g39d4020

2016-05-26 17:47:56

by Filipe Brandenburger

Subject: Re: [PATCH e2fsprogs] Apply LDFLAGS when building tests in lib/e2p

Hi Ted,

Can you please include this patch in upstream e2fsprogs git repo?

This is a complement for 53904ae543591a which added LDFLAGS to the
test cases but seemed to miss these two...

Thank you!
Filipe


On Fri, May 6, 2016 at 4:40 PM, Filipe Brandenburger
<[email protected]> wrote:
> This was previously addressed by Michael Forney on commit 53904ae543591a
> but it seems the test cases from lib/e2p (tst_ostype and tst_feature)
> were missed.
>
> Fix them by adding the same $(ALL_LDFLAGS) to those two targets.
>
> Tested by building it on a system that depends on LDFLAGS to produce
> working binaries and confirming that `make check` succeeds.
>
> Reported-by: Eric Christopher <[email protected]>
> Signed-off-by: Filipe Brandenburger <[email protected]>
> ---
> lib/e2p/Makefile.in | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/lib/e2p/Makefile.in b/lib/e2p/Makefile.in
> index 83f04ff5c04e..d109bf190051 100644
> --- a/lib/e2p/Makefile.in
> +++ b/lib/e2p/Makefile.in
> @@ -68,12 +68,12 @@ e2p.pc: $(srcdir)/e2p.pc.in $(top_builddir)/config.status
> tst_ostype: $(srcdir)/ostype.c
> $(E) " LD $@"
> $(Q) $(CC) -DTEST_PROGRAM -I$(top_srcdir)/lib -o tst_ostype \
> - $(srcdir)/ostype.c $(ALL_CFLAGS)
> + $(srcdir)/ostype.c $(ALL_CFLAGS) $(ALL_LDFLAGS)
>
> tst_feature: $(srcdir)/feature.c
> $(E) " LD $@"
> $(Q) $(CC) -DTEST_PROGRAM -I$(top_srcdir)/lib -o tst_feature \
> - $(srcdir)/feature.c $(ALL_CFLAGS)
> + $(srcdir)/feature.c $(ALL_CFLAGS) $(ALL_LDFLAGS)
>
> check:: tst_ostype tst_feature
> ./tst_ostype
> --
> 2.8.0.rc3.226.g39d4020
>

2016-05-28 23:34:56

by Theodore Ts'o

Subject: Re: [PATCH e2fsprogs] Apply LDFLAGS when building tests in lib/e2p

On Thu, May 26, 2016 at 10:47:54AM -0700, Filipe Brandenburger wrote:
> Hi Ted,
>
> Can you please include this patch in upstream e2fsprogs git repo?
>
> This is a complement for 53904ae543591a which added LDFLAGS to the
> test cases but seemed to miss these two...

Applied, thanks.

- Ted