libs: fix sporadic out-of-tree build failures related to libs
PATCH 1/1 libs: fix sporadic out-of-tree build failures related to libs
Petr reported that out-of-tree builds are sporadically failing:
make[4]: Entering directory '/usr/src/ltp-build/testcases/kernel/syscalls/set_mempolicy' make -C "/usr/src/ltp-build/libs/libltpnuma" -f "/usr/src/ltp-build/libs/libltpnuma/Makefile" all make[5]: Entering directory '/usr/src/ltp-build/libs/libltpnuma'
make[5]: /usr/src/ltp-build/libs/libltpnuma/Makefile: No such file or directory make[5]: *** No rule to make target '/usr/src/ltp-build/libs/libltpnuma/Makefile'. Stop.
It can be triggered reliably by:
make -C $(pwd)/../ltp-build/testcases/kernel/syscalls/set_mempolicy/ \
-f $(pwd)/testcases/kernel/syscalls/set_mempolicy/Makefile \
top_srcdir=$(pwd) top_builddir=$(pwd)/../ltp-buildThis happens when libltpnuma is pulled in as dependency and it's not built yet. Make rules construct path for Makefile based on abs_top_builddir rather than abs_top_srcdir:
$(LTPLIBS_FILES): $(LTPLIBS_DIRS)
$(MAKE) -C "$^" -f "$^/Makefile" all
Fix that by making LTPLIBS_DIRS relative, and add top_{build/src}dir prefix where appropriate. This also moves LTPLIBS_DIRS mkdir target into 'ifdef LTPLIBS' block.
--- include/mk/testcases.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
include/mk/testcases.mk +5 -3
@@ -43,17 +43,19 @@ LDLIBS += -lltp ifdef LTPLIBS -LTPLIBS_DIRS = $(addprefix $(abs_top_builddir)/libs/lib, $(LTPLIBS)) +LTPLIBS_DIRS = $(addprefix libs/lib, $(LTPLIBS)) LTPLIBS_FILES = $(addsuffix .a, $(addprefix $(abs_top_builddir)/libs/, $(foreach LIB,$(LTPLIBS),lib$(LIB)/lib$(LIB)))) MAKE_DEPS += $(LTPLIBS_FILES) $(LTPLIBS_FILES): $(LTPLIBS_DIRS) - $(MAKE) -C "$^" -f "$^/Makefile" all + $(MAKE) -C "$(abs_top_builddir)/$^" -f "$(abs_top_srcdir)/$^/Makefile" all LDFLAGS += $(addprefix -L$(top_builddir)/libs/lib, $(LTPLIBS)) +$(LTPLIBS_DIRS): %: + mkdir -p "$(abs_top_builddir)/$@" endif -$(LTPLIBS_DIRS) $(APICMDS_DIR) $(LIBLTP_DIR): %: +$(APICMDS_DIR) $(LIBLTP_DIR): %: mkdir -p "$@"
Signature · 1 line
1.8.3.1
PATCH 1/1 libs: fix sporadic out-of-tree build failures related to libs
Hi!
Quoted 19 lines
Reported-by Petr Vorel <[email protected]>Cc Cyril Hrubis <[email protected]>Signed-off-by Jan Stancek <[email protected]>--- include/mk/testcases.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)include/mk/testcases.mk +1
-1@@ -43,17 +43,19 @@ LDLIBS += -lltp ifdef LTPLIBS -LTPLIBS_DIRS = $(addprefix $(abs_top_builddir)/libs/lib, $(LTPLIBS)) +LTPLIBS_DIRS = $(addprefix libs/lib, $(LTPLIBS)) LTPLIBS_FILES = $(addsuffix .a, $(addprefix $(abs_top_builddir)/libs/, $(foreach LIB,$(LTPLIBS),lib$(LIB)/lib$(LIB))))
include/mk/testcases.mk LDLIBS += -lltp · line 57
Quoted 10 lines
include/mk/testcases.mk +3
-1MAKE_DEPS += $(LTPLIBS_FILES) $(LTPLIBS_FILES): $(LTPLIBS_DIRS) - $(MAKE) -C "$^" -f "$^/Makefile" all + $(MAKE) -C "$(abs_top_builddir)/$^" -f "$(abs_top_srcdir)/$^/Makefile" all LDFLAGS += $(addprefix -L$(top_builddir)/libs/lib, $(LTPLIBS)) +$(LTPLIBS_DIRS): %: + mkdir -p "$(abs_top_builddir)/$@"
The problem here is that unless the paths in LTPLIBS_DIRS match existing files the mkdir -p is executed every time LTPLIBS is defined in Makefile. I guess that we can put the absolute paths back to the LTPLIBS_DIRS variable and use $(subst ..) to replace the builddir with srcdir but I wonder if there is a better solution.
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH 1/1 libs: fix sporadic out-of-tree build failures related to libs
Quoted 31 lines · Cyril Hrubis
Hi!
Quoted 27 lines
Reported-by Petr Vorel <[email protected]>Cc Cyril Hrubis <[email protected]>Signed-off-by Jan Stancek <[email protected]>---
include/mk/testcases.mk| 8 +++++---1 file changed, 5 insertions(+), 3 deletions(-)include/mk/testcases.mk +0
-0@@ -43,17 +43,19 @@ LDLIBS += -lltpifdef LTPLIBS
include/mk/testcases.mk +1
-1-LTPLIBS_DIRS = $(addprefix $(abs_top_builddir)/libs/lib, $(LTPLIBS)) +LTPLIBS_DIRS = $(addprefix libs/lib, $(LTPLIBS))
LTPLIBS_FILES= $(addsuffix .a, $(addprefix $(abs_top_builddir)/libs/, $(foreach LIB,$(LTPLIBS),lib$(LIB)/lib$(LIB))))
MAKE_DEPS+= $(LTPLIBS_FILES)$(LTPLIBS_FILES): $(LTPLIBS_DIRS)
include/mk/testcases.mk +1
-1- $(MAKE) -C "$^" -f "$^/Makefile" all + $(MAKE) -C "$(abs_top_builddir)/$^" -f "$(abs_top_srcdir)/$^/Makefile" allLDFLAGS += $(addprefix -L$(top_builddir)/libs/lib, $(LTPLIBS))
Quoted 8 lines
include/mk/testcases.mk LDLIBS += -lltp · line 57
Quoted 2 lines
+$(LTPLIBS_DIRS): %:
include/mk/testcases.mk +1
-0+ mkdir -p "$(abs_top_builddir)/$@"The problem here is that unless the paths in
LTPLIBS_DIRSmatch existing files the mkdir -p is executed every time LTPLIBS is defined inMakefile. I guess that we can put the absolute paths back to theLTPLIBS_DIRSvariable and use $(subst ..) to replace the builddir with srcdir but I wonder if there is a better solution.
I don’t think this isn’t the right way. Memory serves me correctly (it’s been almost a decade), the glue code in …/Makefile is incorrect. This is where the directory needs to be created. Let me try implementing a fix.
Cheers,
-Enji
PATCH 1/1 libs: fix sporadic out-of-tree build failures related to libs
Hi Enji,
Quoted 8 lines
Quoted 5 lines
The problem here is that unless the paths in
LTPLIBS_DIRSmatch existing files the mkdir -p is executed every time LTPLIBS is defined inMakefile. I guess that we can put the absolute paths back to theLTPLIBS_DIRSvariable and use $(subst ..) to replace the builddir with srcdir but I wonder if there is a better solution.I don’t think this isn’t the right way. Memory serves me correctly (it’s been almost a decade), the glue code in …/Makefile is incorrect. This is where the directory needs to be created. Let me try implementing a fix.
Any progress on this, please?
Quoted 2 lines
Cheers,
-Enji
Kind regards,
Petr