Skip to content

tools build: Fix header removal build issue

Jiri Olsa lkml 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest7 patches 2 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/7tools build: Add Makefile.includetools/build/Documentation/Build.txt tools/build/Makefile.include tools/build/tests/ex/Makefile +4 more+39 -180 replies
2/7tools build: Add test for missing includetools/build/tests/ex/Build tools/build/tests/ex/Makefile tools/build/tests/ex/ex.c +2 more+39 -12 replies
3/7tools build: Add fixdep dependency helpertools/build/Build tools/build/Makefile tools/build/fixdep.c+212 -00 replies
4/7tools build: Move dependency copy into functiontools/build/Build.include+8 -30 replies
5/7tools build: Make fixdep helper part of the build processtools/build/Build.include tools/build/Makefile.build+15 -20 replies
6/7perf tools: Rename single_dep target to preparetools/perf/Makefile.perf+10 -100 replies
7/7tools build: Build fixdep helper from perf and basic libstools/build/Documentation/Build.txt tools/build/Makefile.include tools/build/tests/ex/Makefile +4 more+32 -120 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 0/7] tools build: Fix header removal build issue

hi,
for dependency tracking we currently use targets that fall out of the gcc -MD command. We store this info in the .cmd file and include as makefile during the build.

This format put object as target and all the c and header files as dependencies, like:

  util/abspath.o: util/abspath.c /usr/include/stdc-predef.h util/cache.h \
   /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
   ...

If any of those dependency header files (krava.h below) is removed the build fails on:

make[1]: *** No rule to make target 'krava.h', needed by 'inc.o'. Stop.

This patch adds fixdep helper, that is used by kbuild to alter the shape of the object dependencies like:

source_util/abspath.o := util/abspath.c

  deps_util/abspath.o := \
    /usr/include/stdc-predef.h \
    util/cache.h \
    ...

  util/abspath.o: $(deps_util/abspath.o)

  $(deps_util/abspath.o):

With this format the header removal won't make the build fail, because it'll be picked up by the last empty target defined for each header.

thanks,
jirka

Cc Kai Germaschewski <[email protected]>

---
Jiri Olsa (7):
tools build: Add Makefile.include
tools build: Add test for missing include
tools build: Add fixdep dependency helper
tools build: Move dependency copy into function tools build: Make fixdep helper part of the build process perf tools: Rename single_dep target to prepare tools build: Build fixdep helper from perf and basic libs

 tools/build/Build                   |   1 +
 tools/build/Build.include           |  17 +++++++++---
 tools/build/Documentation/Build.txt |  52 +++++++++++++++++++++++++++---------
 tools/build/Makefile                |  43 ++++++++++++++++++++++++++++++
 tools/build/Makefile.build          |   7 +++++
 tools/build/Makefile.include        |   6 +++++
 tools/build/fixdep.c                | 168 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 tools/build/tests/ex/Build          |   1 +
 tools/build/tests/ex/Makefile       |  13 +++++----
 tools/build/tests/ex/ex.c           |   2 ++
 tools/build/tests/ex/inc.c          |   8 ++++++
 tools/build/tests/run.sh            |  27 +++++++++++++++++++
 tools/lib/api/Makefile              |   6 +++--
 tools/lib/bpf/Makefile              |   6 +++--
 tools/lib/lockdep/Makefile          |   6 +++--
 tools/perf/Makefile.perf            |  32 +++++++++++-----------
 16 files changed, 352 insertions(+), 43 deletions(-)
 create mode 100644 tools/build/Build
 create mode 100644 tools/build/Makefile
 create mode 100644 tools/build/Makefile.include
 create mode 100644 tools/build/fixdep.c
 create mode 100644 tools/build/tests/ex/inc.c