lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 484/717] tools build: Add missing libcap to test-all.bin target
    Date
    From: Jiri Olsa <jolsa@kernel.org>

    [ Upstream commit 09d59c2f3465fb01e65a0c96698697b026ea8e79 ]

    We're missing -lcap in test-all.bin target, so in case it's the only
    library missing (if more are missing test-all.bin fails anyway), we will
    falsely claim that we detected it and fail build, like:

    $ make
    ...
    Auto-detecting system features:
    ... dwarf: [ on ]
    ... dwarf_getlocations: [ on ]
    ... glibc: [ on ]
    ... libbfd: [ on ]
    ... libbfd-buildid: [ on ]
    ... libcap: [ on ]
    ... libelf: [ on ]
    ... libnuma: [ on ]
    ... numa_num_possible_cpus: [ on ]
    ... libperl: [ on ]
    ... libpython: [ on ]
    ... libcrypto: [ on ]
    ... libunwind: [ on ]
    ... libdw-dwarf-unwind: [ on ]
    ... zlib: [ on ]
    ... lzma: [ on ]
    ... get_cpuid: [ on ]
    ... bpf: [ on ]
    ... libaio: [ on ]
    ... libzstd: [ on ]
    ... disassembler-four-args: [ on ]

    ...

    CC builtin-ftrace.o

    In file included from builtin-ftrace.c:29:
    util/cap.h:11:10: fatal error: sys/capability.h: No such file or directory
    11 | #include <sys/capability.h>
    | ^~~~~~~~~~~~~~~~~~
    compilation terminated.

    Fixes: 74d5f3d06f707eb5 ("tools build: Add capability-related feature detection")
    Signed-off-by: Jiri Olsa <jolsa@kernel.org>
    Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
    Cc: Ian Rogers <irogers@google.com>
    Cc: Igor Lubashev <ilubashe@akamai.com>
    Cc: Mark Rutland <mark.rutland@arm.com>
    Cc: Michael Petlan <mpetlan@redhat.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Stephane Eranian <eranian@google.com>
    Link: http://lore.kernel.org/lkml/20201203230836.3751981-1-jolsa@kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/build/feature/Makefile | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile
    index cdde783f3018b..89ba522e377dc 100644
    --- a/tools/build/feature/Makefile
    +++ b/tools/build/feature/Makefile
    @@ -90,7 +90,7 @@ __BUILDXX = $(CXX) $(CXXFLAGS) -MD -Wall -Werror -o $@ $(patsubst %.bin,%.cpp,$(
    ###############################

    $(OUTPUT)test-all.bin:
    - $(BUILD) -fstack-protector-all -O2 -D_FORTIFY_SOURCE=2 -ldw -lelf -lnuma -lelf -I/usr/include/slang -lslang $(FLAGS_PERL_EMBED) $(FLAGS_PYTHON_EMBED) -DPACKAGE='"perf"' -lbfd -ldl -lz -llzma -lzstd
    + $(BUILD) -fstack-protector-all -O2 -D_FORTIFY_SOURCE=2 -ldw -lelf -lnuma -lelf -I/usr/include/slang -lslang $(FLAGS_PERL_EMBED) $(FLAGS_PYTHON_EMBED) -DPACKAGE='"perf"' -lbfd -ldl -lz -llzma -lzstd -lcap

    $(OUTPUT)test-hello.bin:
    $(BUILD)
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 15:24    [W:4.072 / U:1.164 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site