Hi Ian, On Wed, Nov 9, 2022 at 10:49 AM Ian Rogers <irogers@xxxxxxxxxx> wrote: > > The previous build would add -Itools/lib and get dependencies for > libtraceevent, libsubcmd, libsymbol, libapi and libbpf meaning that > overriding these libraries would change the link time dependency but > the headers would erroneously come from tools/lib. Fix the build to > install headers and then depend on these. To reduce exposing internal > headers/APIs some clean up is performed. tools/lib/symbol has a > Makefile added, while tools/lib/api and tools/lib/subcmd have install > targets added. The pattern used for the dependencies in Makefile.perf > is modelled on libbpf. > > The problem and solution were motivated by this issue and discussion: > https://lore.kernel.org/lkml/CAEf4BzbbOHQZUAe6iWaehKCPQAf3VC=hq657buqe2_yRKxaK-A@xxxxxxxxxxxxxx/ > > v2. Fix a MANIFEST issue for the source tar ball. Add dependencies for > the installed header files so that the build doesn't overtake > building these dependencies. Both issues reported by Arnaldo > Carvalho de Melo <acme@xxxxxxxxxx>. > > Ian Rogers (14): > tools lib api: Add install target > tools lib subcmd: Add install target > perf build: Install libsubcmd locally when building > perf build: Install libapi locally when building > perf build: Install libperf locally when building > perf build: Install libtraceevent locally when building > tools lib api: Add missing install headers > tools lib perf: Add missing install headers > tool lib symbol: Add Makefile/Build > perf build: Install libsymbol locally when building > perf expr: Tidy hashmap dependency > perf thread_map: Reduce exposure of libperf internal API > perf cpumap: Tidy libperf includes > perf build: Use tools/lib headers from install path Acked-by: Namhyung Kim <namhyung@xxxxxxxxxx> Thanks, Namhyung > > tools/lib/api/Makefile | 52 +++++ > tools/lib/perf/Makefile | 10 +- > tools/lib/subcmd/Makefile | 49 +++++ > tools/lib/symbol/Build | 1 + > tools/lib/symbol/Makefile | 115 +++++++++++ > tools/perf/.gitignore | 7 +- > tools/perf/MANIFEST | 3 +- > tools/perf/Makefile.config | 2 - > tools/perf/Makefile.perf | 192 ++++++++++++++---- > tools/perf/builtin-stat.c | 1 + > tools/perf/builtin-trace.c | 4 +- > tools/perf/tests/cpumap.c | 2 +- > tools/perf/tests/expr.c | 1 + > tools/perf/tests/openat-syscall.c | 1 + > tools/perf/tests/pmu-events.c | 1 + > tools/perf/tests/thread-map.c | 1 + > tools/perf/util/Build | 5 - > tools/perf/util/auxtrace.h | 2 +- > tools/perf/util/bpf-loader.c | 4 - > tools/perf/util/bpf_counter.c | 2 +- > tools/perf/util/cpumap.c | 1 + > tools/perf/util/cpumap.h | 2 +- > tools/perf/util/evsel.c | 5 +- > tools/perf/util/evsel.h | 2 - > tools/perf/util/expr.c | 1 + > tools/perf/util/expr.h | 7 +- > tools/perf/util/metricgroup.c | 1 + > tools/perf/util/python.c | 6 +- > .../scripting-engines/trace-event-python.c | 2 +- > tools/perf/util/stat-shadow.c | 1 + > tools/perf/util/stat.c | 4 - > tools/perf/util/thread_map.c | 1 + > tools/perf/util/thread_map.h | 2 - > 33 files changed, 402 insertions(+), 88 deletions(-) > create mode 100644 tools/lib/symbol/Build > create mode 100644 tools/lib/symbol/Makefile > > -- > 2.38.1.431.g37b22c650d-goog >
