Commit Graph

3 Commits

Author SHA1 Message Date
Luca Boccassi
82756ea3ea libbpf: Fixup patch to allow to use packaged version
The original "libbpf: allow to use packaged version" had a symlink as
suggested during review, that got mistakenly dropped by Arnaldo when
applying the patch by hand to fixup conflicts, add it back.

Committer notes:

This caused mixups with libbpf-devel files that ended up breaking the
build as reported by Andrii.

Reported-by: Andrii Nakryiko <andrii.nakryiko@gmail.com>
Tested-by: Acked-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Luca Boccassi <bluca@debian.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2021-06-13 10:22:21 -03:00
Arnaldo Carvalho de Melo
7943374ac5 Revert "libbpf: allow to use packaged version"
This reverts commit 82749180b2.

Getting in the way of releasing 1.20, breaking the build of a dwarves
rpm when a libbpf package is installed in a fedora 33 system:

In file included from /home/acme/rpmbuild/BUILD/dwarves-1.20/strings.c:7:
/home/acme/rpmbuild/BUILD/dwarves-1.20/pahole_strings.h:9:10: fatal error: bpf/btf.h: No such file or directory
    9 | #include <bpf/btf.h>
      |          ^~~~~~~~~~~

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2021-02-03 21:45:00 -03:00
Luca Boccassi
82749180b2 libbpf: allow to use packaged version
Add a new CMake option, LIBBPF_EMBEDDED, to switch between the
embedded version and the system version (searched via pkg-config)
of libbpf. Set the embedded version as the default.

Signed-off-by: Luca Boccassi <bluca@debian.org>
Cc: dwarves@vger.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2021-01-21 10:26:25 -03:00