| Message ID | 20191217112810.768078-1-toke@redhat.com |
|---|---|
| State | Accepted |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | [bpf-next] libbpf: Fix libbpf_common.h when installing libbpf through 'make install' | expand |
On 12/17/19 3:28 AM, Toke Høiland-Jørgensen wrote: > This fixes two issues with the newly introduced libbpf_common.h file: > > - The header failed to include <string.h> for the definition of memset() > - The new file was not included in the install_headers rule in the Makefile > > Both of these issues cause breakage when installing libbpf with 'make > install' and trying to use it in applications. > > Fixes: 544402d4b493 ("libbpf: Extract common user-facing helpers") > Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com> Acked-by: Yonghong Song <yhs@fb.com>
On 12/17/19 10:58 PM, Yonghong Song wrote: > On 12/17/19 3:28 AM, Toke Høiland-Jørgensen wrote: >> This fixes two issues with the newly introduced libbpf_common.h file: >> >> - The header failed to include <string.h> for the definition of memset() >> - The new file was not included in the install_headers rule in the Makefile >> >> Both of these issues cause breakage when installing libbpf with 'make >> install' and trying to use it in applications. >> >> Fixes: 544402d4b493 ("libbpf: Extract common user-facing helpers") >> Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com> > > Acked-by: Yonghong Song <yhs@fb.com> Applied, thanks!
diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile index a3718cb275f2..d4790121adf4 100644 --- a/tools/lib/bpf/Makefile +++ b/tools/lib/bpf/Makefile @@ -251,6 +251,7 @@ install_headers: bpf_helper_defs.h $(call do_install,libbpf.h,$(prefix)/include/bpf,644); \ $(call do_install,btf.h,$(prefix)/include/bpf,644); \ $(call do_install,libbpf_util.h,$(prefix)/include/bpf,644); \ + $(call do_install,libbpf_common.h,$(prefix)/include/bpf,644); \ $(call do_install,xsk.h,$(prefix)/include/bpf,644); \ $(call do_install,bpf_helpers.h,$(prefix)/include/bpf,644); \ $(call do_install,bpf_helper_defs.h,$(prefix)/include/bpf,644); \ diff --git a/tools/lib/bpf/libbpf_common.h b/tools/lib/bpf/libbpf_common.h index 4fb833840961..a23ae1ac27eb 100644 --- a/tools/lib/bpf/libbpf_common.h +++ b/tools/lib/bpf/libbpf_common.h @@ -9,6 +9,8 @@ #ifndef __LIBBPF_LIBBPF_COMMON_H #define __LIBBPF_LIBBPF_COMMON_H +#include <string.h> + #ifndef LIBBPF_API #define LIBBPF_API __attribute__((visibility("default"))) #endif
This fixes two issues with the newly introduced libbpf_common.h file: - The header failed to include <string.h> for the definition of memset() - The new file was not included in the install_headers rule in the Makefile Both of these issues cause breakage when installing libbpf with 'make install' and trying to use it in applications. Fixes: 544402d4b493 ("libbpf: Extract common user-facing helpers") Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com> --- tools/lib/bpf/Makefile | 1 + tools/lib/bpf/libbpf_common.h | 2 ++ 2 files changed, 3 insertions(+)