• Arnaldo Carvalho de Melo's avatar
    Revert "libtraceevent: Increase libtraceevent logging when verbose" · dc9f2dd5
    Arnaldo Carvalho de Melo authored
    This reverts commit 08efcb4a.
    
    This breaks the build as it will prefer using libbpf-devel header files,
    even when not using LIBBPF_DYNAMIC=1, breaking the build.
    
    This was detected on OpenSuSE Tumbleweed with libtraceevent-devel 1.3.0,
    as described by Jiri Slaby:
    
    =======================================================================
    It breaks build with LIBTRACEEVENT_DYNAMIC and version 1.3.0:
    > util/debug.c: In function ‘perf_debug_option’:
    > util/debug.c:243:17: error: implicit declaration of function
    ‘tep_set_loglevel’ [-Werror=implicit-function-declaration]
    >   243 |                 tep_set_loglevel(TEP_LOG_INFO);
    >       |                 ^~~~~~~~~~~~~~~~
    > util/debug.c:243:34: error: ‘TEP_LOG_INFO’ undeclared (first use in this
    function); did you mean ‘TEP_PRINT_INFO’?
    >   243 |                 tep_set_loglevel(TEP_LOG_INFO);
    >       |                                  ^~~~~~~~~~~~
    >       |                                  TEP_PRINT_INFO
    > util/debug.c:243:34: note: each undeclared identifier is reported only once
    for each function it appears in
    > util/debug.c:245:34: error: ‘TEP_LOG_DEBUG’ undeclared (first use in this
    function)
    >   245 |                 tep_set_loglevel(TEP_LOG_DEBUG);
    >       |                                  ^~~~~~~~~~~~~
    > util/debug.c:247:34: error: ‘TEP_LOG_ALL’ undeclared (first use in this
    function)
    >   247 |                 tep_set_loglevel(TEP_LOG_ALL);
    >       |                                  ^~~~~~~~~~~
    
    It is because the gcc's command line looks like:
    gcc
    ...
    -I/home/abuild/rpmbuild/BUILD/tools/lib/
    ...
    -DLIBTRACEEVENT_VERSION=65790
    ...
    =======================================================================
    
    The proper way to fix this is more involved and so not suitable for this
    late in the 5.16-rc stage.
    Reported-by: default avatarJiri Slaby <jirislaby@kernel.org>
    Link: https://lore.kernel.org/lkml/bc2b0786-8965-1bcd-2316-9d9bb37b9c31@kernel.org
    Cc: Andrii Nakryiko <andrii.nakryiko@gmail.com>
    Cc: Ian Rogers <irogers@google.com>
    Cc: Jiri Olsa <jolsa@kernel.org>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Song Liu <songliubraving@fb.com>
    Cc: Steven Rostedt <rostedt@goodmis.org>
    Link: https://lore.kernel.org/lkml/YddGjjmlMZzxUZbN@kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
    dc9f2dd5
debug.c 5.83 KB