Re: [PATCH 4/4] build: Switch to new openssl API for test-libcrypto

[Arnaldo Carvalho de Melo <acme@kernel.org>]

Em Mon, Aug 08, 2022 at 03:33:34PM -0300, Arnaldo Carvalho de Melo escreveu:
> Em Mon, Aug 08, 2022 at 06:14:48PM +0200, Daniel Borkmann escreveu:
> > Hi Arnaldo,
> > 
> > On 7/19/22 7:05 PM, Roberto Sassu wrote:
> > > Switch to new EVP API for detecting libcrypto, as Fedora 36 returns an
> > > error when it encounters the deprecated function MD5_Init() and the others.
> > > The error would be interpreted as missing libcrypto, while in reality it is
> > > not.
> > > 
> > > Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com>
> > 
> > Given rest of the tooling fixes from Andres Freund went via perf tree and the
> > below is perf related as well, I presume you'll pick this up, too?
> 
> Sure.
>  
> >   [0] https://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git/log/?h=perf/core

So I fixed up the first one, minor fuzzes, the second I had to fix
conflicts with the patchset from Andres, ended up as below, will test
build it then in my container kit.

- Arnaldo

commit bea955a0256e20cc18e87087e42f2a903b9a8b84
Author: Roberto Sassu <roberto.sassu@huawei.com>
Date:   Tue Jul 19 19:05:53 2022 +0200

    bpftool: Complete libbfd feature detection
    
    Commit 6e8ccb4f624a7 ("tools/bpf: properly account for libbfd variations")
    sets the linking flags depending on which flavor of the libbfd feature was
    detected.
    
    However, the flavors except libbfd cannot be detected, as they are not in
    the feature list.
    
    Complete the list of features to detect by adding libbfd-liberty and
    libbfd-liberty-z.
    
    Committer notes:
    
    Adjust conflict with with:
    
      1e1613f64cc8a09d ("tools bpftool: Don't display disassembler-four-args feature test")
      600b7b26c07a070d ("tools bpftool: Fix compilation error with new binutils")
    
    Fixes: 6e8ccb4f624a73c5 ("tools/bpf: properly account for libbfd variations")
    Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com>
    Cc: Alexei Starovoitov <ast@kernel.org>
    Cc: Andres Freund <andres@anarazel.de>
    Cc: Andrii Nakryiko <andrii@kernel.org>
    Cc: bpf@vger.kernel.org
    Cc: Daniel Borkmann <daniel@iogearbox.net>
    Cc: Ingo Molnar <mingo@redhat.com>
    Cc: John Fastabend <john.fastabend@gmail.com>
    Cc: KP Singh <kpsingh@kernel.org>
    Cc: llvm@lists.linux.dev
    Cc: Martin KaFai Lau <martin.lau@linux.dev>
    Cc: Nathan Chancellor <nathan@kernel.org>
    Cc: Nick Desaulniers <ndesaulniers@google.com>
    Cc: Nick Terrell <terrelln@fb.com>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Quentin Monnet <quentin@isovalent.com>
    Cc: Song Liu <song@kernel.org>
    Cc: Stanislav Fomichev <sdf@google.com>
    Link: https://lore.kernel.org/r/20220719170555.2576993-2-roberto.sassu@huawei.com
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/bpf/bpftool/Makefile b/tools/bpf/bpftool/Makefile
index 04d733e98bffbc08..9cc132277150c534 100644
--- a/tools/bpf/bpftool/Makefile
+++ b/tools/bpf/bpftool/Makefile
@@ -93,9 +93,11 @@ INSTALL ?= install
 RM ?= rm -f
 
 FEATURE_USER = .bpftool
-FEATURE_TESTS = libbfd disassembler-four-args disassembler-init-styled libcap \
+FEATURE_TESTS = libbfd libbfd-liberty libbfd-liberty-z
+	disassembler-four-args disassembler-init-styled libcap \
 	clang-bpf-co-re
-FEATURE_DISPLAY = libbfd libcap clang-bpf-co-re
+FEATURE_DISPLAY = libbfd libbfd-liberty libbfd-liberty-z
+	libcap clang-bpf-co-re
 
 check_feat := 1
 NON_CHECK_FEAT_TARGETS := clean uninstall doc doc-clean doc-install doc-uninstall