PR#5: Add additional header files to devel package and fix include - rpms/bcc

rpms / bcc

#5 Add additional header files to devel package and fix include

Closed 5 years ago by acaringi. Opened 5 years ago by acaringi.

rpms/ acaringi/bcc f29 into f29

Add additional header files to devel package and fix include

Augusto Caringi • 5 years ago

df11897

bcc-0.7.0-Set-additional-headers-for-installation.patch

file added

+36

		`@@ -0,0 +1,36 @@`
		`+ From 9adafa085c720d99aff2025d613d7d18e2508624 Mon Sep 17 00:00:00 2001`
		`+ From: Augusto Caringi <acaringi@redhat.com>`
		`+ Date: Tue, 30 Oct 2018 23:59:41 +0100`
		`+ Subject: [PATCH] Set additional headers for installation`
		`+`
		`+ These headers can be required by other tools (bpftrace) depending on bcc`
		`+ tools.`
		`+ ---`
		`+ src/cc/CMakeLists.txt \| 4 ++++`
		`+ 1 file changed, 4 insertions(+)`
		`+`
		`+ diff --git a/src/cc/CMakeLists.txt b/src/cc/CMakeLists.txt`
		`+ index fda165d..3401593 100644`
		`+ --- a/src/cc/CMakeLists.txt`
		`+ +++ b/src/cc/CMakeLists.txt`
		`+ @@ -39,6 +39,8 @@ set(bcc_sym_sources bcc_syms.cc bcc_elf.c bcc_perf_map.c bcc_proc.c)`
		`+ set(bcc_common_headers libbpf.h perf_reader.h)`
		`+ set(bcc_table_headers file_desc.h table_desc.h table_storage.h)`
		`+ set(bcc_api_headers bpf_common.h bpf_module.h bcc_exception.h bcc_syms.h)`
		`+ +set(bcc_other_headers common.h syms.h ns_guard.h)`
		`+ +set(bcc_frontends_clang_headers frontends/clang/kbuild_helper.h)`
		`+`
		`+ if(ENABLE_CLANG_JIT)`
		`+ add_library(bcc-shared SHARED`
		`+ @@ -98,6 +100,8 @@ set(bcc-lua-static ${bcc-lua-static} ${bcc_common_libs_for_lua})`
		`+ install(TARGETS bcc-shared LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})`
		`+ install(FILES ${bcc_table_headers} DESTINATION include/bcc)`
		`+ install(FILES ${bcc_api_headers} DESTINATION include/bcc)`
		`+ +install(FILES ${bcc_other_headers} DESTINATION include/bcc)`
		`+ +install(FILES ${bcc_frontends_clang_headers} DESTINATION include/bcc/frontends/clang)`
		`+ install(DIRECTORY compat/linux/ DESTINATION include/bcc/compat/linux FILES_MATCHING PATTERN "*.h")`
		`+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libbcc.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)`
		`+ endif(ENABLE_CLANG_JIT)`
		`+ --`
		`+ 2.17.2`
		`+`

bcc-0.7.0-kbuild_helper.h-Add-required-include-2000.patch

file added

+38

		`@@ -0,0 +1,38 @@`
		`+ From 1b5e08ebc6c415317f8e132a6578e6849e5ea3bf Mon Sep 17 00:00:00 2001`
		`+ From: Alastair Robertson <alastairrob@hotmail.com>`
		`+ Date: Sun, 7 Oct 2018 07:22:43 +0100`
		`+ Subject: [PATCH] kbuild_helper.h: Add required #include (#2000)`
		`+`
		`+ kbuild_helper.h: Add required #include ftw.h`
		`+ ---`
		`+ src/cc/frontends/clang/kbuild_helper.cc \| 1 -`
		`+ src/cc/frontends/clang/kbuild_helper.h \| 1 +`
		`+ 2 files changed, 1 insertion(+), 1 deletion(-)`
		`+`
		`+ diff --git a/src/cc/frontends/clang/kbuild_helper.cc b/src/cc/frontends/clang/kbuild_helper.cc`
		`+ index e105064..63bb7d2 100644`
		`+ --- a/src/cc/frontends/clang/kbuild_helper.cc`
		`+ +++ b/src/cc/frontends/clang/kbuild_helper.cc`
		`+ @@ -15,7 +15,6 @@`
		`+ */`
		`+ #include <fcntl.h>`
		`+ #include <stdlib.h>`
		`+ -#include <ftw.h>`
		`+ #include <iostream>`
		`+ #include "kbuild_helper.h"`
		`+`
		`+ diff --git a/src/cc/frontends/clang/kbuild_helper.h b/src/cc/frontends/clang/kbuild_helper.h`
		`+ index a3f5e47..5a271ff 100644`
		`+ --- a/src/cc/frontends/clang/kbuild_helper.h`
		`+ +++ b/src/cc/frontends/clang/kbuild_helper.h`
		`+ @@ -19,6 +19,7 @@`
		`+ #include <vector>`
		`+ #include <unistd.h>`
		`+ #include <errno.h>`
		`+ +#include <ftw.h>`
		`+`
		`+ namespace ebpf {`
		`+`
		`+ --`
		`+ 2.17.2`
		`+`

bcc.spec

file modified

+7 -1

		`@@ -9,7 +9,7 @@`

		`Name: bcc`
		`Version: 0.7.0`
		`- Release: 3%{?dist}`
		`+ Release: 4%{?dist}`
		`Summary: BPF Compiler Collection (BCC)`
		`License: ASL 2.0`
		`URL: https://github.com/iovisor/bcc`
		`@@ -21,6 +21,8 @@`
		`Patch1: %{name}-%{version}-utf8-encoding.patch`
		`# https://bugzilla.redhat.com/show_bug.cgi?id=1637515`
		`Patch2: %{name}-%{version}-killsnoop-str-bytes.patch`
		`+ Patch3: %{name}-%{version}-kbuild_helper.h-Add-required-include-2000.patch`
		`+ Patch4: %{name}-%{version}-Set-additional-headers-for-installation.patch`

		`# Arches will be included as upstream support is added and dependencies are`
		`# satisfied in the respective arches`
		`@@ -172,6 +174,10 @@`


		`%changelog`
		`+ * Wed Oct 31 2018 Augusto Caringi <acaringi@redhat.com> - 0.7.0-4`
		`+ - Add additional header files to devel package`
		`+ - Fix include in kbuild_helper.h header`
		`+`
		`* Mon Oct 22 2018 Rafael dos Santos <rdossant@redhat.com> - 0.7.0-3`
		`- Fix encoding of non-utf8 characters (#1516678)`
		`- Fix str-bytes conversion in killsnoop (#1637515)`