* [LTP] [PATCH 1/3] build system: Add explicit make rules
2020-07-31 12:15 [LTP] [PATCH 0/3] Build system fixes Cyril Hrubis
@ 2020-07-31 12:15 ` Cyril Hrubis
2020-08-03 7:47 ` Jan Stancek
2020-07-31 12:15 ` [LTP] [PATCH 2/3] testcases: Make use of LTPLDLIBS Cyril Hrubis
` (2 subsequent siblings)
3 siblings, 1 reply; 12+ messages in thread
From: Cyril Hrubis @ 2020-07-31 12:15 UTC (permalink / raw)
To: ltp
This commit adds explicit build rules, the main motivation are recent
build failures caused by library orderings. To fix that this commit
introduces LTPLDLIBS special variable that is passed to linker before
the LDLIBS which avoids the need for tricks as
"LDLIBS := -lltpfoo $(LDLIBS)" in the Makefiles.
This commit also silences the output by default a bit, the verbose
output could be enabled by VERBOSE=1 env variable, which is probably
what most of the build systems will do if this gets commited. I guess
that we can as well silence a bit the "make entering/leaving directory"
if this the right way to go.
Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
---
include/mk/env_post.mk | 2 ++
include/mk/rules.mk | 29 +++++++++++++++++++++++++++++
2 files changed, 31 insertions(+)
create mode 100644 include/mk/rules.mk
diff --git a/include/mk/env_post.mk b/include/mk/env_post.mk
index f4169ad66..bdf8c696d 100644
--- a/include/mk/env_post.mk
+++ b/include/mk/env_post.mk
@@ -107,4 +107,6 @@ $(error You must define $$(prefix) before executing install)
endif # END $(filter-out install,$(MAKECMDGOALS)),$(MAKECMDGOALS)
endif
+include $(top_srcdir)/include/mk/rules.mk
+
endif
diff --git a/include/mk/rules.mk b/include/mk/rules.mk
new file mode 100644
index 000000000..e9b9c35ef
--- /dev/null
+++ b/include/mk/rules.mk
@@ -0,0 +1,29 @@
+%.o: %.c
+ifdef VERBOSE
+ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
+else
+ @$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
+ @echo CC $@
+endif
+
+ifdef VERBOSE
+COMPILE.c=$(CC) $(CPPFLAGS) $(CFLAGS) -c
+else
+COMPILE.c=@echo CC $@; $(CC) $(CPPFLAGS) $(CFLAGS) -c
+endif
+
+%: %.o
+ifdef VERBOSE
+ $(CC) $(LDFLAGS) $^ $(LTPLDLIBS) $(LDLIBS) -o $@
+else
+ @$(CC) $(LDFLAGS) $^ $(LTPLDLIBS) $(LDLIBS) -o $@
+ @echo LD $@
+endif
+
+%: %.c
+ifdef VERBOSE
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $^ $(LTPLDLIBS) $(LDLIBS) -o $@
+else
+ @$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $^ $(LTPLDLIBS) $(LDLIBS) -o $@
+ @echo CC $@
+endif
--
2.26.2
^ permalink raw reply related [flat|nested] 12+ messages in thread* [LTP] [PATCH 1/3] build system: Add explicit make rules
2020-07-31 12:15 ` [LTP] [PATCH 1/3] build system: Add explicit make rules Cyril Hrubis
@ 2020-08-03 7:47 ` Jan Stancek
2020-08-03 7:59 ` Li Wang
` (2 more replies)
0 siblings, 3 replies; 12+ messages in thread
From: Jan Stancek @ 2020-08-03 7:47 UTC (permalink / raw)
To: ltp
----- Original Message -----
> This commit adds explicit build rules, the main motivation are recent
> build failures caused by library orderings. To fix that this commit
> introduces LTPLDLIBS special variable that is passed to linker before
> the LDLIBS which avoids the need for tricks as
> "LDLIBS := -lltpfoo $(LDLIBS)" in the Makefiles.
>
> This commit also silences the output by default a bit, the verbose
> output could be enabled by VERBOSE=1 env variable, which is probably
> what most of the build systems will do if this gets commited. I guess
> that we can as well silence a bit the "make entering/leaving directory"
> if this the right way to go.
alias for V=0 / V=1 would be nice
LTPLDLIBS should probably be mentioned in doc/build-system-guide.txt
>
> Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
> ---
> include/mk/env_post.mk | 2 ++
> include/mk/rules.mk | 29 +++++++++++++++++++++++++++++
> 2 files changed, 31 insertions(+)
> create mode 100644 include/mk/rules.mk
>
> diff --git a/include/mk/env_post.mk b/include/mk/env_post.mk
> index f4169ad66..bdf8c696d 100644
> --- a/include/mk/env_post.mk
> +++ b/include/mk/env_post.mk
> @@ -107,4 +107,6 @@ $(error You must define $$(prefix) before executing
> install)
> endif # END $(filter-out install,$(MAKECMDGOALS)),$(MAKECMDGOALS)
> endif
>
> +include $(top_srcdir)/include/mk/rules.mk
> +
> endif
> diff --git a/include/mk/rules.mk b/include/mk/rules.mk
> new file mode 100644
> index 000000000..e9b9c35ef
> --- /dev/null
> +++ b/include/mk/rules.mk
> @@ -0,0 +1,29 @@
> +%.o: %.c
> +ifdef VERBOSE
> + $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
> +else
> + @$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
> + @echo CC $@
> +endif
What if we wouldn't print "DIR" (for non-clean targets) and printed relative paths instead?
CC lib/tst_timer_test.o
CC lib/tst_checkpoint.o
CC lib/tst_supported_fs_types.o
...
CC lib/tests/tst_dataroot03
CC lib/tests/tst_strerrno
..
CC lib/newlib_tests/test07
CC lib/newlib_tests/test13
CC lib/newlib_tests/test11
..
CC testcases/kernel/syscalls/execv/execv01_child
CC testcases/kernel/syscalls/execv/execv01
CC testcases/kernel/syscalls/exit/exit01
CC testcases/kernel/syscalls/exit/exit02
CC testcases/kernel/syscalls/setresgid/setresgid02.o
LD testcases/kernel/syscalls/setresgid/setresgid02
CC testcases/kernel/syscalls/setresgid/setresgid03.o
LD testcases/kernel/syscalls/setresgid/setresgid03
diff --git a/include/mk/env_pre.mk b/include/mk/env_pre.mk
index c4a1f470810e..abc7e7cf9e02 100644
--- a/include/mk/env_pre.mk
+++ b/include/mk/env_pre.mk
@@ -79,7 +79,9 @@ builddir := .
abs_builddir := $(CURDIR)
-cwd_rel_from_top := $(subst $(abs_top_builddir),,$(abs_builddir))
+cwd_rel1 := $(subst $(abs_top_builddir),,$(abs_builddir))
+cwd_rel2 := $(subst $(abs_top_builddir)/,,$(abs_builddir))
+cwd_rel_from_top := $(if $(cwd_rel1),$(cwd_rel2),$(cwd_rel1))
# Where's the source located at? Squish all of the / away by using abspath...
ifdef MAKE_3_80_COMPAT
diff --git a/include/mk/generic_trunk_target.inc b/include/mk/generic_trunk_target.inc
index e89c7f4e0028..fc59f944fc14 100644
--- a/include/mk/generic_trunk_target.inc
+++ b/include/mk/generic_trunk_target.inc
@@ -103,7 +103,6 @@ ifdef VERBOSE
done
else
@set -e; for dir in $(SUBDIRS); do \
- echo "DIR $$dir"; \
$(MAKE) --no-print-directory -C $$dir -f "$(abs_srcdir)/$$dir/Makefile" $@; \
done
endif
diff --git a/include/mk/rules.mk b/include/mk/rules.mk
index e9b9c35ef224..6a22e43af7ec 100644
--- a/include/mk/rules.mk
+++ b/include/mk/rules.mk
@@ -1,15 +1,17 @@
+target_rel_dir := $(if $(cwd_rel_from_top),$(cwd_rel_from_top)/,)
+
%.o: %.c
ifdef VERBOSE
$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
else
@$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
- @echo CC $@
+ @echo CC $(target_rel_dir)$@
endif
ifdef VERBOSE
COMPILE.c=$(CC) $(CPPFLAGS) $(CFLAGS) -c
else
-COMPILE.c=@echo CC $@; $(CC) $(CPPFLAGS) $(CFLAGS) -c
+COMPILE.c=@echo CC $(target_rel_dir)$@; $(CC) $(CPPFLAGS) $(CFLAGS) -c
endif
%: %.o
@@ -17,7 +19,7 @@ ifdef VERBOSE
$(CC) $(LDFLAGS) $^ $(LTPLDLIBS) $(LDLIBS) -o $@
else
@$(CC) $(LDFLAGS) $^ $(LTPLDLIBS) $(LDLIBS) -o $@
- @echo LD $@
+ @echo LD $(target_rel_dir)$@
endif
%: %.c
@@ -25,5 +27,5 @@ ifdef VERBOSE
$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $^ $(LTPLDLIBS) $(LDLIBS) -o $@
else
@$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $^ $(LTPLDLIBS) $(LDLIBS) -o $@
- @echo CC $@
+ @echo CC $(target_rel_dir)$@
endif
^ permalink raw reply related [flat|nested] 12+ messages in thread* [LTP] [PATCH 1/3] build system: Add explicit make rules
2020-08-03 7:47 ` Jan Stancek
@ 2020-08-03 7:59 ` Li Wang
2020-08-03 13:27 ` Petr Vorel
2020-08-05 9:27 ` Cyril Hrubis
2 siblings, 0 replies; 12+ messages in thread
From: Li Wang @ 2020-08-03 7:59 UTC (permalink / raw)
To: ltp
On Mon, Aug 3, 2020 at 3:48 PM Jan Stancek <jstancek@redhat.com> wrote:
>
> ----- Original Message -----
> > This commit adds explicit build rules, the main motivation are recent
> > build failures caused by library orderings. To fix that this commit
> > introduces LTPLDLIBS special variable that is passed to linker before
> > the LDLIBS which avoids the need for tricks as
> > "LDLIBS := -lltpfoo $(LDLIBS)" in the Makefiles.
> >
> > This commit also silences the output by default a bit, the verbose
> > output could be enabled by VERBOSE=1 env variable, which is probably
> > what most of the build systems will do if this gets commited. I guess
> > that we can as well silence a bit the "make entering/leaving directory"
> > if this the right way to go.
>
> alias for V=0 / V=1 would be nice
>
> LTPLDLIBS should probably be mentioned in doc/build-system-guide.txt
>
>
> >
> > Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
> > ---
> > include/mk/env_post.mk | 2 ++
> > include/mk/rules.mk | 29 +++++++++++++++++++++++++++++
> > 2 files changed, 31 insertions(+)
> > create mode 100644 include/mk/rules.mk
> >
> > diff --git a/include/mk/env_post.mk b/include/mk/env_post.mk
> > index f4169ad66..bdf8c696d 100644
> > --- a/include/mk/env_post.mk
> > +++ b/include/mk/env_post.mk
> > @@ -107,4 +107,6 @@ $(error You must define $$(prefix) before executing
> > install)
> > endif # END $(filter-out install,$(MAKECMDGOALS)),$(MAKECMDGOALS)
> > endif
> >
> > +include $(top_srcdir)/include/mk/rules.mk
> > +
> > endif
> > diff --git a/include/mk/rules.mk b/include/mk/rules.mk
> > new file mode 100644
> > index 000000000..e9b9c35ef
> > --- /dev/null
> > +++ b/include/mk/rules.mk
> > @@ -0,0 +1,29 @@
> > +%.o: %.c
> > +ifdef VERBOSE
> > + $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
> > +else
> > + @$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
> > + @echo CC $@
> > +endif
>
> What if we wouldn't print "DIR" (for non-clean targets) and printed
> relative paths instead?
>
+1
This looks better, I'd give my vote to this.
--
Regards,
Li Wang
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.linux.it/pipermail/ltp/attachments/20200803/bfdd6dc6/attachment-0001.htm>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [LTP] [PATCH 1/3] build system: Add explicit make rules
2020-08-03 7:47 ` Jan Stancek
2020-08-03 7:59 ` Li Wang
@ 2020-08-03 13:27 ` Petr Vorel
2020-08-05 9:27 ` Cyril Hrubis
2 siblings, 0 replies; 12+ messages in thread
From: Petr Vorel @ 2020-08-03 13:27 UTC (permalink / raw)
To: ltp
Hi all,
> ----- Original Message -----
> > This commit adds explicit build rules, the main motivation are recent
> > build failures caused by library orderings. To fix that this commit
> > introduces LTPLDLIBS special variable that is passed to linker before
> > the LDLIBS which avoids the need for tricks as
> > "LDLIBS := -lltpfoo $(LDLIBS)" in the Makefiles.
> > This commit also silences the output by default a bit, the verbose
> > output could be enabled by VERBOSE=1 env variable, which is probably
> > what most of the build systems will do if this gets commited. I guess
> > that we can as well silence a bit the "make entering/leaving directory"
> > if this the right way to go.
> alias for V=0 / V=1 would be nice
> LTPLDLIBS should probably be mentioned in doc/build-system-guide.txt
...
> What if we wouldn't print "DIR" (for non-clean targets) and printed relative paths instead?
+1 to all suggestions (including Li's to avoid printing DIR in 3rd commit).
Kind regards,
Petr
^ permalink raw reply [flat|nested] 12+ messages in thread
* [LTP] [PATCH 1/3] build system: Add explicit make rules
2020-08-03 7:47 ` Jan Stancek
2020-08-03 7:59 ` Li Wang
2020-08-03 13:27 ` Petr Vorel
@ 2020-08-05 9:27 ` Cyril Hrubis
2020-08-05 10:31 ` Li Wang
2 siblings, 1 reply; 12+ messages in thread
From: Cyril Hrubis @ 2020-08-05 9:27 UTC (permalink / raw)
To: ltp
Hi!
> > This commit adds explicit build rules, the main motivation are recent
> > build failures caused by library orderings. To fix that this commit
> > introduces LTPLDLIBS special variable that is passed to linker before
> > the LDLIBS which avoids the need for tricks as
> > "LDLIBS := -lltpfoo $(LDLIBS)" in the Makefiles.
> >
> > This commit also silences the output by default a bit, the verbose
> > output could be enabled by VERBOSE=1 env variable, which is probably
> > what most of the build systems will do if this gets commited. I guess
> > that we can as well silence a bit the "make entering/leaving directory"
> > if this the right way to go.
>
> alias for V=0 / V=1 would be nice
Done in a follow up patch.
> LTPLDLIBS should probably be mentioned in doc/build-system-guide.txt
I've added a line to the variables listing in there before pushing.
> >
> > Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
> > ---
> > include/mk/env_post.mk | 2 ++
> > include/mk/rules.mk | 29 +++++++++++++++++++++++++++++
> > 2 files changed, 31 insertions(+)
> > create mode 100644 include/mk/rules.mk
> >
> > diff --git a/include/mk/env_post.mk b/include/mk/env_post.mk
> > index f4169ad66..bdf8c696d 100644
> > --- a/include/mk/env_post.mk
> > +++ b/include/mk/env_post.mk
> > @@ -107,4 +107,6 @@ $(error You must define $$(prefix) before executing
> > install)
> > endif # END $(filter-out install,$(MAKECMDGOALS)),$(MAKECMDGOALS)
> > endif
> >
> > +include $(top_srcdir)/include/mk/rules.mk
> > +
> > endif
> > diff --git a/include/mk/rules.mk b/include/mk/rules.mk
> > new file mode 100644
> > index 000000000..e9b9c35ef
> > --- /dev/null
> > +++ b/include/mk/rules.mk
> > @@ -0,0 +1,29 @@
> > +%.o: %.c
> > +ifdef VERBOSE
> > + $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
> > +else
> > + @$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
> > + @echo CC $@
> > +endif
>
> What if we wouldn't print "DIR" (for non-clean targets) and printed relative paths instead?
Great idea, I've added these changes to the first patch in the series
before I pushed it.
--
Cyril Hrubis
chrubis@suse.cz
^ permalink raw reply [flat|nested] 12+ messages in thread
* [LTP] [PATCH 2/3] testcases: Make use of LTPLDLIBS
2020-07-31 12:15 [LTP] [PATCH 0/3] Build system fixes Cyril Hrubis
2020-07-31 12:15 ` [LTP] [PATCH 1/3] build system: Add explicit make rules Cyril Hrubis
@ 2020-07-31 12:15 ` Cyril Hrubis
2020-07-31 12:15 ` [LTP] [PATCH 3/3] build system: Silence the output a bit more Cyril Hrubis
2020-07-31 13:02 ` [LTP] [PATCH 0/3] Build system fixes Petr Vorel
3 siblings, 0 replies; 12+ messages in thread
From: Cyril Hrubis @ 2020-07-31 12:15 UTC (permalink / raw)
To: ltp
Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
---
testcases/kernel/syscalls/clock_gettime/Makefile | 2 +-
testcases/kernel/syscalls/ipc/msgctl/Makefile | 2 +-
testcases/kernel/syscalls/ipc/msgget/Makefile | 2 +-
testcases/kernel/syscalls/ipc/msgrcv/Makefile | 2 +-
testcases/kernel/syscalls/ipc/msgsnd/Makefile | 2 +-
testcases/kernel/syscalls/ipc/msgstress/Makefile | 2 +-
testcases/kernel/syscalls/ipc/semctl/Makefile | 4 ++--
testcases/kernel/syscalls/ipc/semget/Makefile | 2 +-
testcases/kernel/syscalls/ipc/semop/Makefile | 2 +-
testcases/kernel/syscalls/ipc/shmat/Makefile | 2 +-
testcases/kernel/syscalls/ipc/shmctl/Makefile | 4 ++--
testcases/kernel/syscalls/ipc/shmdt/Makefile | 2 +-
testcases/kernel/syscalls/ipc/shmget/Makefile | 2 +-
testcases/kernel/syscalls/kill/Makefile | 4 ++--
testcases/kernel/syscalls/mbind/Makefile | 6 ++++--
testcases/kernel/syscalls/mremap/Makefile | 2 +-
testcases/kernel/syscalls/rt_sigtimedwait/Makefile | 2 +-
testcases/kernel/syscalls/set_mempolicy/Makefile | 3 ++-
testcases/kernel/syscalls/sigtimedwait/Makefile | 2 +-
testcases/kernel/syscalls/sigwait/Makefile | 2 +-
testcases/kernel/syscalls/sigwaitinfo/Makefile | 2 +-
21 files changed, 28 insertions(+), 25 deletions(-)
diff --git a/testcases/kernel/syscalls/clock_gettime/Makefile b/testcases/kernel/syscalls/clock_gettime/Makefile
index 1c1cbd7a8..e7f5e9e75 100644
--- a/testcases/kernel/syscalls/clock_gettime/Makefile
+++ b/testcases/kernel/syscalls/clock_gettime/Makefile
@@ -8,6 +8,6 @@ LTPLIBS = ltpvdso
include $(top_srcdir)/include/mk/testcases.mk
LDLIBS+=-lrt
-clock_gettime04: LDLIBS += -lltpvdso
+clock_gettime04: LTPLDLIBS = -lltpvdso
include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/syscalls/ipc/msgctl/Makefile b/testcases/kernel/syscalls/ipc/msgctl/Makefile
index a11cbcf2e..6b2b26d05 100644
--- a/testcases/kernel/syscalls/ipc/msgctl/Makefile
+++ b/testcases/kernel/syscalls/ipc/msgctl/Makefile
@@ -7,6 +7,6 @@ LTPLIBS = ltpnewipc
include $(top_srcdir)/include/mk/testcases.mk
-LDLIBS += -lltpnewipc
+LTPLDLIBS = -lltpnewipc
include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/syscalls/ipc/msgget/Makefile b/testcases/kernel/syscalls/ipc/msgget/Makefile
index a11cbcf2e..6b2b26d05 100644
--- a/testcases/kernel/syscalls/ipc/msgget/Makefile
+++ b/testcases/kernel/syscalls/ipc/msgget/Makefile
@@ -7,6 +7,6 @@ LTPLIBS = ltpnewipc
include $(top_srcdir)/include/mk/testcases.mk
-LDLIBS += -lltpnewipc
+LTPLDLIBS = -lltpnewipc
include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/syscalls/ipc/msgrcv/Makefile b/testcases/kernel/syscalls/ipc/msgrcv/Makefile
index f62cd1f48..26b9f264d 100644
--- a/testcases/kernel/syscalls/ipc/msgrcv/Makefile
+++ b/testcases/kernel/syscalls/ipc/msgrcv/Makefile
@@ -7,6 +7,6 @@ LTPLIBS = ltpipc
include $(top_srcdir)/include/mk/testcases.mk
-LDLIBS += -lltpipc
+LTPLDLIBS = -lltpipc
include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/syscalls/ipc/msgsnd/Makefile b/testcases/kernel/syscalls/ipc/msgsnd/Makefile
index 17960cae3..85017fe90 100644
--- a/testcases/kernel/syscalls/ipc/msgsnd/Makefile
+++ b/testcases/kernel/syscalls/ipc/msgsnd/Makefile
@@ -11,6 +11,6 @@ endif
include $(top_srcdir)/include/mk/testcases.mk
-LDLIBS += -lltpnewipc
+LTPLDLIBS += -lltpnewipc
include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/syscalls/ipc/msgstress/Makefile b/testcases/kernel/syscalls/ipc/msgstress/Makefile
index f62cd1f48..b821bda01 100644
--- a/testcases/kernel/syscalls/ipc/msgstress/Makefile
+++ b/testcases/kernel/syscalls/ipc/msgstress/Makefile
@@ -7,6 +7,6 @@ LTPLIBS = ltpipc
include $(top_srcdir)/include/mk/testcases.mk
-LDLIBS += -lltpipc
+LTPLDLIBS += -lltpipc
include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/syscalls/ipc/semctl/Makefile b/testcases/kernel/syscalls/ipc/semctl/Makefile
index 99971a7db..f711e7750 100644
--- a/testcases/kernel/syscalls/ipc/semctl/Makefile
+++ b/testcases/kernel/syscalls/ipc/semctl/Makefile
@@ -7,7 +7,7 @@ LTPLIBS = ltpipc ltpnewipc
include $(top_srcdir)/include/mk/testcases.mk
-semctl01 semctl02 semctl03 semctl04 semctl05 semctl06 semctl07: LDLIBS += -lltpipc
-semctl08: LDLIBS += -lltpnewipc
+semctl01 semctl02 semctl03 semctl04 semctl05 semctl06 semctl07: LTPLDLIBS = -lltpipc
+semctl08: LTPLDLIBS = -lltpnewipc
include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/syscalls/ipc/semget/Makefile b/testcases/kernel/syscalls/ipc/semget/Makefile
index f62cd1f48..26b9f264d 100644
--- a/testcases/kernel/syscalls/ipc/semget/Makefile
+++ b/testcases/kernel/syscalls/ipc/semget/Makefile
@@ -7,6 +7,6 @@ LTPLIBS = ltpipc
include $(top_srcdir)/include/mk/testcases.mk
-LDLIBS += -lltpipc
+LTPLDLIBS = -lltpipc
include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/syscalls/ipc/semop/Makefile b/testcases/kernel/syscalls/ipc/semop/Makefile
index f62cd1f48..26b9f264d 100644
--- a/testcases/kernel/syscalls/ipc/semop/Makefile
+++ b/testcases/kernel/syscalls/ipc/semop/Makefile
@@ -7,6 +7,6 @@ LTPLIBS = ltpipc
include $(top_srcdir)/include/mk/testcases.mk
-LDLIBS += -lltpipc
+LTPLDLIBS = -lltpipc
include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/syscalls/ipc/shmat/Makefile b/testcases/kernel/syscalls/ipc/shmat/Makefile
index a11cbcf2e..6b2b26d05 100644
--- a/testcases/kernel/syscalls/ipc/shmat/Makefile
+++ b/testcases/kernel/syscalls/ipc/shmat/Makefile
@@ -7,6 +7,6 @@ LTPLIBS = ltpnewipc
include $(top_srcdir)/include/mk/testcases.mk
-LDLIBS += -lltpnewipc
+LTPLDLIBS = -lltpnewipc
include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/syscalls/ipc/shmctl/Makefile b/testcases/kernel/syscalls/ipc/shmctl/Makefile
index 0172bb495..2e0ed0ceb 100644
--- a/testcases/kernel/syscalls/ipc/shmctl/Makefile
+++ b/testcases/kernel/syscalls/ipc/shmctl/Makefile
@@ -10,7 +10,7 @@ shmctl05: LDLIBS += -lrt
include $(top_srcdir)/include/mk/testcases.mk
-shmctl01 shmctl02 shmctl03 shmctl04 shmctl05: LDLIBS += -lltpipc
-shmctl06: LDLIBS += -lltpnewipc
+shmctl01 shmctl02 shmctl03 shmctl04 shmctl05: LTPLDLIBS = -lltpipc
+shmctl06: LTPLDLIBS = -lltpnewipc
include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/syscalls/ipc/shmdt/Makefile b/testcases/kernel/syscalls/ipc/shmdt/Makefile
index f62cd1f48..26b9f264d 100644
--- a/testcases/kernel/syscalls/ipc/shmdt/Makefile
+++ b/testcases/kernel/syscalls/ipc/shmdt/Makefile
@@ -7,6 +7,6 @@ LTPLIBS = ltpipc
include $(top_srcdir)/include/mk/testcases.mk
-LDLIBS += -lltpipc
+LTPLDLIBS = -lltpipc
include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/syscalls/ipc/shmget/Makefile b/testcases/kernel/syscalls/ipc/shmget/Makefile
index f62cd1f48..26b9f264d 100644
--- a/testcases/kernel/syscalls/ipc/shmget/Makefile
+++ b/testcases/kernel/syscalls/ipc/shmget/Makefile
@@ -7,6 +7,6 @@ LTPLIBS = ltpipc
include $(top_srcdir)/include/mk/testcases.mk
-LDLIBS += -lltpipc
+LTPLDLIBS = -lltpipc
include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/syscalls/kill/Makefile b/testcases/kernel/syscalls/kill/Makefile
index 00cadabef..3d1b1468a 100644
--- a/testcases/kernel/syscalls/kill/Makefile
+++ b/testcases/kernel/syscalls/kill/Makefile
@@ -7,7 +7,7 @@ LTPLIBS = ltpipc
include $(top_srcdir)/include/mk/testcases.mk
-kill07: LDLIBS += -lltpipc
-kill05: LDLIBS += -lltpipc
+kill07: LTPLDLIBS = -lltpipc
+kill05: LTPLDLIBS = -lltpipc
include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/syscalls/mbind/Makefile b/testcases/kernel/syscalls/mbind/Makefile
index 6d571271c..ed7d4375c 100644
--- a/testcases/kernel/syscalls/mbind/Makefile
+++ b/testcases/kernel/syscalls/mbind/Makefile
@@ -3,12 +3,14 @@
top_srcdir ?= ../../../..
+LTPLIBS=ltpnuma
+
include $(top_srcdir)/include/mk/testcases.mk
CPPFLAGS += -I$(abs_srcdir)/../utils/
-LDLIBS += $(NUMA_LIBS) -lltpnuma
-LDFLAGS += -L$(top_builddir)/libs/libltpnuma
+LDLIBS += $(NUMA_LIBS)
+LTPLDLIBS = -lltpnuma
include $(top_srcdir)/testcases/kernel/include/lib.mk
include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/syscalls/mremap/Makefile b/testcases/kernel/syscalls/mremap/Makefile
index 7bdf425d2..190b7659d 100644
--- a/testcases/kernel/syscalls/mremap/Makefile
+++ b/testcases/kernel/syscalls/mremap/Makefile
@@ -7,6 +7,6 @@ LTPLIBS = ltpipc
include $(top_srcdir)/include/mk/testcases.mk
-mremap04: LDLIBS += -lltpipc
+mremap04: LTPLDLIBS = -lltpipc
include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/syscalls/rt_sigtimedwait/Makefile b/testcases/kernel/syscalls/rt_sigtimedwait/Makefile
index 2055e703b..1ae50b32c 100644
--- a/testcases/kernel/syscalls/rt_sigtimedwait/Makefile
+++ b/testcases/kernel/syscalls/rt_sigtimedwait/Makefile
@@ -7,6 +7,6 @@ LTPLIBS = ltpsigwait
include $(top_srcdir)/include/mk/testcases.mk
-LDLIBS := -lltpsigwait $(LDLIBS)
+LTPLDLIBS = -lltpsigwait
include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/syscalls/set_mempolicy/Makefile b/testcases/kernel/syscalls/set_mempolicy/Makefile
index a0b79d6e1..55ac0026f 100644
--- a/testcases/kernel/syscalls/set_mempolicy/Makefile
+++ b/testcases/kernel/syscalls/set_mempolicy/Makefile
@@ -4,6 +4,7 @@ LTPLIBS = ltpnuma
include $(top_srcdir)/include/mk/testcases.mk
-LDLIBS += $(NUMA_LIBS) -lltpnuma
+LDLIBS += $(NUMA_LIBS)
+LTPLDLIBS = -lltpnuma
include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/syscalls/sigtimedwait/Makefile b/testcases/kernel/syscalls/sigtimedwait/Makefile
index 2055e703b..1ae50b32c 100644
--- a/testcases/kernel/syscalls/sigtimedwait/Makefile
+++ b/testcases/kernel/syscalls/sigtimedwait/Makefile
@@ -7,6 +7,6 @@ LTPLIBS = ltpsigwait
include $(top_srcdir)/include/mk/testcases.mk
-LDLIBS := -lltpsigwait $(LDLIBS)
+LTPLDLIBS = -lltpsigwait
include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/syscalls/sigwait/Makefile b/testcases/kernel/syscalls/sigwait/Makefile
index 2055e703b..1ae50b32c 100644
--- a/testcases/kernel/syscalls/sigwait/Makefile
+++ b/testcases/kernel/syscalls/sigwait/Makefile
@@ -7,6 +7,6 @@ LTPLIBS = ltpsigwait
include $(top_srcdir)/include/mk/testcases.mk
-LDLIBS := -lltpsigwait $(LDLIBS)
+LTPLDLIBS = -lltpsigwait
include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/syscalls/sigwaitinfo/Makefile b/testcases/kernel/syscalls/sigwaitinfo/Makefile
index 2055e703b..1ae50b32c 100644
--- a/testcases/kernel/syscalls/sigwaitinfo/Makefile
+++ b/testcases/kernel/syscalls/sigwaitinfo/Makefile
@@ -7,6 +7,6 @@ LTPLIBS = ltpsigwait
include $(top_srcdir)/include/mk/testcases.mk
-LDLIBS := -lltpsigwait $(LDLIBS)
+LTPLDLIBS = -lltpsigwait
include $(top_srcdir)/include/mk/generic_leaf_target.mk
--
2.26.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [LTP] [PATCH 3/3] build system: Silence the output a bit more
2020-07-31 12:15 [LTP] [PATCH 0/3] Build system fixes Cyril Hrubis
2020-07-31 12:15 ` [LTP] [PATCH 1/3] build system: Add explicit make rules Cyril Hrubis
2020-07-31 12:15 ` [LTP] [PATCH 2/3] testcases: Make use of LTPLDLIBS Cyril Hrubis
@ 2020-07-31 12:15 ` Cyril Hrubis
2020-08-03 7:52 ` Li Wang
2020-07-31 13:02 ` [LTP] [PATCH 0/3] Build system fixes Petr Vorel
3 siblings, 1 reply; 12+ messages in thread
From: Cyril Hrubis @ 2020-07-31 12:15 UTC (permalink / raw)
To: ltp
This hides a few more messages, mostly make entering/leaving directory
and the empty library check.
Now rebuilding a ltp library and test looks like:
$ make
BUILD libltpsigwait.a
CC sigwait.o
ar -rc "libltpsigwait.a" sigwait.o
ranlib "libltpsigwait.a"
CC sigwait01
While previously (or with a VERBOSE=1) it looks like:
$ VERBOSE=1 make
make -C "/home/metan/Work/ltp-dev/libs/libltpsigwait/" -f "/home/metan/Work/ltp-dev/libs/libltpsigwait//Makefile" all
make[1]: Entering directory '/home/metan/Work/ltp-dev/libs/libltpsigwait'
gcc -I../../include -I../../include -I../../include/old/ -g -O2 -g -O2 -fno-strict-aliasing -pipe -Wall -W -Wold-style-definition -c -o sigwait.o sigwait.c
ar -rc "libltpsigwait.a" sigwait.o
ranlib "libltpsigwait.a"
make[1]: Leaving directory '/home/metan/Work/ltp-dev/libs/libltpsigwait'
gcc -I../../../../include -I../../../../include -I../../../../include/old/ -g -O2 -g -O2 -fno-strict-aliasing -pipe -Wall -W -Wold-style-definition -L../../../../libs/libltpsigwait -L../../../../lib sigwait01.c -lltpsigwait -lltp -o sigwait01
Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
---
include/mk/generic_trunk_target.inc | 14 ++++++++++++++
include/mk/lib.mk | 2 +-
include/mk/testcases.mk | 5 +++++
3 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/include/mk/generic_trunk_target.inc b/include/mk/generic_trunk_target.inc
index cc255c62a..e89c7f4e0 100644
--- a/include/mk/generic_trunk_target.inc
+++ b/include/mk/generic_trunk_target.inc
@@ -75,9 +75,16 @@ trunk-install: $(INSTALL_FILES)
all: trunk-all
clean:: trunk-clean
+ifdef VERBOSE
@set -e; for dir in $(SUBDIRS); do \
$(MAKE) -C "$$dir" -f "$(abs_srcdir)/$$dir/Makefile" $@; \
done
+else
+ @set -e; for dir in $(SUBDIRS); do \
+ echo "DIR $$dir"; \
+ $(MAKE) --no-print-directory -C "$$dir" -f "$(abs_srcdir)/$$dir/Makefile" $@; \
+ done
+endif
ifneq ($(abs_builddir),$(abs_srcdir))
$(RM) -Rf $(SUBDIRS)
endif
@@ -90,9 +97,16 @@ ifeq ($(strip $(SUBDIRS)),)
$(error SUBDIRS empty -- did you want generic_leaf_target instead?)
else
$(RECURSIVE_TARGETS): %: | $(SUBDIRS)
+ifdef VERBOSE
@set -e; for dir in $(SUBDIRS); do \
$(MAKE) -C $$dir -f "$(abs_srcdir)/$$dir/Makefile" $@; \
done
+else
+ @set -e; for dir in $(SUBDIRS); do \
+ echo "DIR $$dir"; \
+ $(MAKE) --no-print-directory -C $$dir -f "$(abs_srcdir)/$$dir/Makefile" $@; \
+ done
+endif
endif
# vim: syntax=make
diff --git a/include/mk/lib.mk b/include/mk/lib.mk
index 36e1ba17b..5c310b42a 100644
--- a/include/mk/lib.mk
+++ b/include/mk/lib.mk
@@ -63,7 +63,7 @@ LIBSRCS := $(filter-out $(FILTER_OUT_LIBSRCS),$(LIBSRCS))
LIBOBJS := $(LIBSRCS:.c=.o)
$(LIB): $(notdir $(LIBOBJS))
- if [ -z "$(strip $^)" ] ; then \
+ @if [ -z "$(strip $^)" ] ; then \
echo "Cowardly refusing to create empty archive"; \
exit 1; \
fi
diff --git a/include/mk/testcases.mk b/include/mk/testcases.mk
index bb22be82e..1c81773d0 100644
--- a/include/mk/testcases.mk
+++ b/include/mk/testcases.mk
@@ -53,7 +53,12 @@ MAKE_DEPS += $(LTPLIBS_FILES)
$(LTPLIBS_FILES): $(LTPLIBS_DIRS)
$(LTPLIBS_FILES): %:
+ifdef VERBOSE
$(MAKE) -C "$(dir $@)" -f "$(subst $(abs_top_builddir),$(abs_top_srcdir),$(dir $@))/Makefile" all
+else
+ @echo "BUILD $(notdir $@)"
+ @$(MAKE) --no-print-directory -C "$(dir $@)" -f "$(subst $(abs_top_builddir),$(abs_top_srcdir),$(dir $@))/Makefile" all
+endif
LDFLAGS += $(addprefix -L$(top_builddir)/libs/lib, $(LTPLIBS))
--
2.26.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [LTP] [PATCH 0/3] Build system fixes
2020-07-31 12:15 [LTP] [PATCH 0/3] Build system fixes Cyril Hrubis
` (2 preceding siblings ...)
2020-07-31 12:15 ` [LTP] [PATCH 3/3] build system: Silence the output a bit more Cyril Hrubis
@ 2020-07-31 13:02 ` Petr Vorel
3 siblings, 0 replies; 12+ messages in thread
From: Petr Vorel @ 2020-07-31 13:02 UTC (permalink / raw)
To: ltp
Hi Cyril,
> This patchset does
> * Introduce LTPLDLIBS to solve linker dependencies once for all
> * Cleans up the output from make a bit, this could be even more fine
> tuned if we agree on this part
> Cyril Hrubis (3):
> build system: Add explicit make rules
> testcases: Make use of LTPLDLIBS
> build system: Silence the output a bit more
Thanks for addressing this issue!
Works as expected:
https://travis-ci.org/github/pevik/ltp/builds/713670475
LGTM and silence output is also a nice feature.
nit: I was thinking how to reduce verbosity (adding --no-print-directory and @
into a variable), but as there is also echo, it's not worth of it.
Tested-by: Petr Vorel <pvorel@suse.cz>
Reviewed-by: Petr Vorel <pvorel@suse.cz>
Kind regards,
Petr
^ permalink raw reply [flat|nested] 12+ messages in thread