1 |
commit: 0e821488d4d0c35a79ad06e29eafda3baf1636ac |
2 |
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com> |
3 |
AuthorDate: Thu Feb 20 19:00:49 2020 +0000 |
4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 20 19:00:49 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e821488 |
7 |
|
8 |
dev-util/bcc: Remove old versions |
9 |
|
10 |
Copyright: Sony Interactive Entertainment Inc. |
11 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
12 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
13 |
|
14 |
dev-util/bcc/Manifest | 6 -- |
15 |
dev-util/bcc/bcc-0.10.0.ebuild | 85 ------------------- |
16 |
dev-util/bcc/bcc-0.6.0.ebuild | 51 ------------ |
17 |
dev-util/bcc/bcc-0.7.0.ebuild | 51 ------------ |
18 |
dev-util/bcc/bcc-0.9.0-r1.ebuild | 73 ----------------- |
19 |
dev-util/bcc/files/bcc-0.9.0-system-libbpf.patch | 100 ----------------------- |
20 |
6 files changed, 366 deletions(-) |
21 |
|
22 |
diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest |
23 |
index 8b05001468e..c2fcfba21e8 100644 |
24 |
--- a/dev-util/bcc/Manifest |
25 |
+++ b/dev-util/bcc/Manifest |
26 |
@@ -1,12 +1,6 @@ |
27 |
-DIST bcc-0.10.0.tar.gz 2052430 BLAKE2B 562aa95d34ba329ce966bca3164af45fe6d78487e5f0d370a0a90c5d91af75b4adcc5aa1e6578bf598e55dc51394c5a218fc19e2b57b2f7241cc3fe1f3a4e513 SHA512 92ba0f57d22af610ac81661526fed8bec80d502bcbc8aa5048ba7c50911247c020832db23afdcf9b555b142cd387c228cf7baa0ddc94067165403e362227f235 |
28 |
DIST bcc-0.11.0.tar.gz 2611511 BLAKE2B db12e10a3da11b1d3691ca5e0e036f56af4c5765d49e2edefc3e30bc90036a5f521d196db797e3725e618efa68ba2550848b3dc044015f6aea6b2da6ca2a34f5 SHA512 4854a5a15a89a8bd3a10daa6f0e831428316751280902cbdc74f3c6f78263ee1c58521ae9125804e72fec6482702818a5fec781436400640627e4b7c2fc189fb |
29 |
DIST bcc-0.12.0.tar.gz 2627075 BLAKE2B 44c435eaaf6233ad24249cf5da4e778cd31e41573199ded97d1f411c7424128fb11f838c55fa48c692b4d5f267ea594d6cab9992dc76137da1b41453285c98c5 SHA512 db3ea929b1296f4d9d82d2a11e89e11a1c31512d3f7f935475a7613e0128a5cf9441f3138969535ef41de0c0f677c7446f62f1c64575d41a9896e5339f3f112b |
30 |
DIST bcc-0.13.0.tar.gz 3928016 BLAKE2B ecaf2dc077a5e0b808ea1d588a89793291ed56de8747e1cb59f0e841b70e4a4f0333e2941ee2b42b5b9a570cd8d4f9941be772e7790186be156e452a416d40bb SHA512 7c82007979814ac11d1dfc81fe8e00d988f518f7fbba3e115851e17500c22eca23b33b84f9053acc10aefda0ee3b80429f8daf1389590c2d3686ee8d7ced72cb |
31 |
-DIST bcc-0.6.0.tar.gz 1986593 BLAKE2B 514c2c781eb94d99560232d8050b5664ce3565622b236e78cd111be27b3482849965600a1d574f59243917672f00bb3cef65cab63103f6c4a5cf62024c683d9b SHA512 1a8edf6da22f3119a74cf43f03ec83b97ed2f6fc18828d750d8a695ac1451b6b3209e5d2cf48bc87f53fa9447e8813a018a58d31588d477e4aa364a2d0217e80 |
32 |
-DIST bcc-0.7.0.tar.gz 2009289 BLAKE2B 370b553521289d983d1165633e76a5e405250b9b09dbf3e78c127d232908e73facce06097ce4dbf0bbccda929b6715a9b7460affe123556087c8ca00b8d62c0b SHA512 ebe6c4cbecba2d587c69af71ddc8cb451b2b8e1d49ef887f291c813320c2c60d49357500fc2751d5b418df2be1d02763c385d89de6efa6e10f049c25acf01b4e |
33 |
-DIST bcc-0.9.0-linux-5-bpf.patch.xz 28524 BLAKE2B f0369e50eabd7b1eb9a492b9652cd7647c7c7fda3b01db1e7f2bf716e76357d07d67193b31189b98309e26895ac3dd5c755d4cef6bc592e4674f40710c33539c SHA512 fc5b828a5826da2cf1e1a76758c635f5443d202aecbe3f269d78abcaa0117ad7658bea6c43e7b60e1ecc6bcc65bd19b100217758a1203d278ddb03c5837c43f1 |
34 |
-DIST bcc-0.9.0.tar.gz 2036984 BLAKE2B cebbeb57f06af90442d28be1633a54c198bf796786c4fcca3a83dea03bc76949f958dd24f7d85feb2e3402576410f965754f3d031076486b7d378493c56035e8 SHA512 373080181380ec3bcb13469e29ff1f792e924a2df00a614da4647ed54060ad216525dd0f49c5d0afba7946a6d2f4e3475af97250a33db825945af3d165294091 |
35 |
-DIST libbpf-0.0.3.tar.gz 127328 BLAKE2B eaa1be54f0a7fcc6fd41eb2adaad2f405f76db3bd7c7466a5484ead1cca5a9fe775e331838cd5645d7399cb5b1a5b2fcb3814fb45643660fd3f7d84b9986bae6 SHA512 ee489d968cd9a20a1f091dcd2696d3807ab0db2a001613684402de2c696391eea033f3bd961eaf1d0df95c1e15f4f0ccfb7003ff98c3f08f24a7e9a8db22cdad |
36 |
DIST libbpf-0.0.5.tar.gz 160335 BLAKE2B 2cf4a3e6edc002b3a32f9d08bb22a07863d8f6f90472e9593a9e9a93b08a00f0557d5a59fa841325b947e6f7b129232e7cd1fdc906f45de57b0dbe594548f1c2 SHA512 e42f6cc8f834f2d3cf9138d655bd3727ffffb2693850f7f6409ec4d536336bc5fa479a64eefc802a5915e333677eca843f8f1bd0132589bba10bdc89064eee0c |
37 |
DIST libbpf-0.0.6.tar.gz 213791 BLAKE2B 9f0a08cc7bae41f7fa93d5ba2f535f76ce47fe691efb6bac6257b88a5607deb62fa53f59984d83b6070ccd573c902899f7528b376d9acbfd77317659de6ab061 SHA512 1678133d9a2bd1cf13d4d1f9b83bb3f0642de91e3e3c8d785e2993257035573aff39b9a1a457e73d9c4c1c66b6a52544a8ad06ac560766d335428bb3fc421e71 |
38 |
DIST libbpf-0.0.7.tar.gz 262068 BLAKE2B e77ff25449274881ddb9d32f25cd6ad8988e4524102bd109049ee6cfce3e2753fd99ebe2a080f809a4c5422dbf6b17633e4b0cea156f289bf95b92f8375a273c SHA512 c2cbc869b7e11339deab3152a6e2d0b3bba25da513d18d77fb0a698cbe61d6bd48175a58e7dd7a3695fbf27faf48b4f517ac5d3a3c66c086df2e5d1b73a2595d |
39 |
|
40 |
diff --git a/dev-util/bcc/bcc-0.10.0.ebuild b/dev-util/bcc/bcc-0.10.0.ebuild |
41 |
deleted file mode 100644 |
42 |
index 08138b6375b..00000000000 |
43 |
--- a/dev-util/bcc/bcc-0.10.0.ebuild |
44 |
+++ /dev/null |
45 |
@@ -1,85 +0,0 @@ |
46 |
-# Copyright 1999-2020 Gentoo Authors |
47 |
-# Distributed under the terms of the GNU General Public License v2 |
48 |
- |
49 |
-EAPI=7 |
50 |
- |
51 |
-PYTHON_COMPAT=( python3_{6,7} ) |
52 |
- |
53 |
-inherit cmake-utils linux-info python-single-r1 |
54 |
- |
55 |
-EGIT_COMMIT="v${PV}" |
56 |
-LIBBPF_VER="0.0.3" |
57 |
- |
58 |
-DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more" |
59 |
-HOMEPAGE="https://iovisor.github.io/bcc/" |
60 |
- |
61 |
-# This bundles libbpf, I tried to unbundle it, but I am not good enough |
62 |
-# with cmake to do it. Patches accepted... |
63 |
-SRC_URI="https://github.com/iovisor/bcc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz |
64 |
- https://github.com/libbpf/libbpf/archive/${LIBBPF_VER}.tar.gz -> libbpf-${LIBBPF_VER}.tar.gz" |
65 |
- |
66 |
-LICENSE="Apache-2.0" |
67 |
-SLOT="0" |
68 |
-KEYWORDS="~amd64 ~arm64 ~x86" |
69 |
-IUSE="+luajit test" |
70 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
71 |
- |
72 |
-RDEPEND=">=sys-kernel/linux-headers-4.18 |
73 |
- >=dev-libs/elfutils-0.166:= |
74 |
- sys-devel/clang:= |
75 |
- >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] |
76 |
- luajit? ( dev-lang/luajit ) |
77 |
- ${PYTHON_DEPS}" |
78 |
-DEPEND="${RDEPEND} |
79 |
- test? ( |
80 |
- || ( |
81 |
- net-misc/iputils[arping] |
82 |
- net-analyzer/arping |
83 |
- ) |
84 |
- net-analyzer/netperf |
85 |
- net-misc/iperf:* |
86 |
- )" |
87 |
-BDEPEND="dev-util/cmake |
88 |
- virtual/pkgconfig" |
89 |
- |
90 |
-S=${WORKDIR}/${PN}-${EGIT_COMMIT#v} |
91 |
- |
92 |
-PATCHES=( |
93 |
- "${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch" |
94 |
-) |
95 |
- |
96 |
-# tests need root access |
97 |
-RESTRICT="test" |
98 |
- |
99 |
-pkg_pretend() { |
100 |
- local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF |
101 |
- ~BPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL |
102 |
- ~KPROBES" |
103 |
- |
104 |
- check_extra_config |
105 |
-} |
106 |
- |
107 |
-pkg_setup() { |
108 |
- python-single-r1_pkg_setup |
109 |
-} |
110 |
- |
111 |
-src_prepare() { |
112 |
- rmdir src/cc/libbpf || die |
113 |
- mv "${WORKDIR}"/libbpf-${LIBBPF_VER} src/cc/libbpf || die |
114 |
- |
115 |
- cmake-utils_src_prepare |
116 |
-} |
117 |
- |
118 |
-src_configure() { |
119 |
- local mycmakeargs=( |
120 |
- -DREVISION=${PV%%_*} |
121 |
- $(usex luajit '-DWITH_LUAJIT=1' '' '' '') |
122 |
- ) |
123 |
- |
124 |
- cmake-utils_src_configure |
125 |
-} |
126 |
- |
127 |
-src_install() { |
128 |
- cmake-utils_src_install |
129 |
- python_fix_shebang "${ED}" |
130 |
-} |
131 |
|
132 |
diff --git a/dev-util/bcc/bcc-0.6.0.ebuild b/dev-util/bcc/bcc-0.6.0.ebuild |
133 |
deleted file mode 100644 |
134 |
index deff44f3e73..00000000000 |
135 |
--- a/dev-util/bcc/bcc-0.6.0.ebuild |
136 |
+++ /dev/null |
137 |
@@ -1,51 +0,0 @@ |
138 |
-# Copyright 1999-2020 Gentoo Authors |
139 |
-# Distributed under the terms of the GNU General Public License v2 |
140 |
- |
141 |
-EAPI=6 |
142 |
- |
143 |
-PYTHON_COMPAT=( python3_6 ) |
144 |
- |
145 |
-inherit cmake-utils linux-info python-single-r1 |
146 |
- |
147 |
-DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more" |
148 |
-HOMEPAGE="https://iovisor.github.io/bcc/" |
149 |
-EGIT_COMMIT="v${PV}" |
150 |
-SRC_URI="https://github.com/iovisor/bcc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" |
151 |
-RESTRICT="test" |
152 |
- |
153 |
-LICENSE="Apache-2.0" |
154 |
-SLOT="0" |
155 |
-KEYWORDS="~amd64 ~x86" |
156 |
-IUSE="" |
157 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
158 |
- |
159 |
-RDEPEND=">=dev-libs/elfutils-0.166:= |
160 |
- sys-devel/clang:= |
161 |
- >=sys-devel/llvm-3.7:=[llvm_targets_BPF(+)] |
162 |
- ${PYTHON_DEPS}" |
163 |
-DEPEND="${RDEPEND}" |
164 |
-S=${WORKDIR}/${PN}-${EGIT_COMMIT#v} |
165 |
- |
166 |
-pkg_pretend() { |
167 |
- local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF |
168 |
- ~BPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL" |
169 |
- |
170 |
- check_extra_config |
171 |
-} |
172 |
- |
173 |
-pkg_setup() { |
174 |
- python-single-r1_pkg_setup |
175 |
-} |
176 |
- |
177 |
-src_configure() { |
178 |
- local mycmakeargs=( |
179 |
- -DREVISION=${PV%%_*} |
180 |
- ) |
181 |
- |
182 |
- cmake-utils_src_configure |
183 |
-} |
184 |
- |
185 |
-src_install() { |
186 |
- cmake-utils_src_install |
187 |
- python_fix_shebang "${ED}" |
188 |
-} |
189 |
|
190 |
diff --git a/dev-util/bcc/bcc-0.7.0.ebuild b/dev-util/bcc/bcc-0.7.0.ebuild |
191 |
deleted file mode 100644 |
192 |
index 718f0921ce9..00000000000 |
193 |
--- a/dev-util/bcc/bcc-0.7.0.ebuild |
194 |
+++ /dev/null |
195 |
@@ -1,51 +0,0 @@ |
196 |
-# Copyright 1999-2020 Gentoo Authors |
197 |
-# Distributed under the terms of the GNU General Public License v2 |
198 |
- |
199 |
-EAPI=6 |
200 |
- |
201 |
-PYTHON_COMPAT=( python3_{6,7} ) |
202 |
- |
203 |
-inherit cmake-utils linux-info python-single-r1 |
204 |
- |
205 |
-DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more" |
206 |
-HOMEPAGE="https://iovisor.github.io/bcc/" |
207 |
-EGIT_COMMIT="v${PV}" |
208 |
-SRC_URI="https://github.com/iovisor/bcc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" |
209 |
-RESTRICT="test" |
210 |
- |
211 |
-LICENSE="Apache-2.0" |
212 |
-SLOT="0" |
213 |
-KEYWORDS="~amd64 ~x86" |
214 |
-IUSE="" |
215 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
216 |
- |
217 |
-RDEPEND=">=dev-libs/elfutils-0.166:= |
218 |
- sys-devel/clang:= |
219 |
- >=sys-devel/llvm-3.7:=[llvm_targets_BPF(+)] |
220 |
- ${PYTHON_DEPS}" |
221 |
-DEPEND="${RDEPEND}" |
222 |
-S=${WORKDIR}/${PN}-${EGIT_COMMIT#v} |
223 |
- |
224 |
-pkg_pretend() { |
225 |
- local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF |
226 |
- ~BPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL" |
227 |
- |
228 |
- check_extra_config |
229 |
-} |
230 |
- |
231 |
-pkg_setup() { |
232 |
- python-single-r1_pkg_setup |
233 |
-} |
234 |
- |
235 |
-src_configure() { |
236 |
- local mycmakeargs=( |
237 |
- -DREVISION=${PV%%_*} |
238 |
- ) |
239 |
- |
240 |
- cmake-utils_src_configure |
241 |
-} |
242 |
- |
243 |
-src_install() { |
244 |
- cmake-utils_src_install |
245 |
- python_fix_shebang "${ED}" |
246 |
-} |
247 |
|
248 |
diff --git a/dev-util/bcc/bcc-0.9.0-r1.ebuild b/dev-util/bcc/bcc-0.9.0-r1.ebuild |
249 |
deleted file mode 100644 |
250 |
index 86203a8d50d..00000000000 |
251 |
--- a/dev-util/bcc/bcc-0.9.0-r1.ebuild |
252 |
+++ /dev/null |
253 |
@@ -1,73 +0,0 @@ |
254 |
-# Copyright 1999-2020 Gentoo Authors |
255 |
-# Distributed under the terms of the GNU General Public License v2 |
256 |
- |
257 |
-EAPI=7 |
258 |
- |
259 |
-PYTHON_COMPAT=( python3_{6,7} ) |
260 |
- |
261 |
-inherit cmake-utils linux-info python-single-r1 |
262 |
- |
263 |
-DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more" |
264 |
-HOMEPAGE="https://iovisor.github.io/bcc/" |
265 |
-EGIT_COMMIT="v${PV}" |
266 |
-SRC_URI="https://github.com/iovisor/bcc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz |
267 |
- mirror://gentoo/bcc-0.9.0-linux-5-bpf.patch.xz" |
268 |
-RESTRICT="test" |
269 |
- |
270 |
-LICENSE="Apache-2.0" |
271 |
-SLOT="0" |
272 |
-KEYWORDS="~amd64 ~arm64 ~x86" |
273 |
-IUSE="+luajit" |
274 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
275 |
- |
276 |
-RDEPEND="dev-libs/libbpf:= |
277 |
- >=sys-kernel/linux-headers-4.18 |
278 |
- >=dev-libs/elfutils-0.166:= |
279 |
- sys-devel/clang:= |
280 |
- >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] |
281 |
- luajit? ( dev-lang/luajit ) |
282 |
- ${PYTHON_DEPS}" |
283 |
-DEPEND="${RDEPEND}" |
284 |
-BDEPEND="dev-util/cmake |
285 |
- virtual/pkgconfig" |
286 |
- |
287 |
-S=${WORKDIR}/${PN}-${EGIT_COMMIT#v} |
288 |
- |
289 |
-PATCHES=( |
290 |
- "${FILESDIR}/bcc-0.9.0-system-libbpf.patch" |
291 |
- "${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch" |
292 |
-) |
293 |
- |
294 |
-pkg_pretend() { |
295 |
- local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF |
296 |
- ~BPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL |
297 |
- ~KPROBES" |
298 |
- |
299 |
- check_extra_config |
300 |
-} |
301 |
- |
302 |
-pkg_setup() { |
303 |
- python-single-r1_pkg_setup |
304 |
-} |
305 |
- |
306 |
-src_prepare() { |
307 |
- # needs bpf.h from linux-5.0 to build |
308 |
- has_version '>=sys-kernel/linux-headers-5.0' || \ |
309 |
- eapply "${WORKDIR}/bcc-0.9.0-linux-5-bpf.patch" |
310 |
- |
311 |
- cmake-utils_src_prepare |
312 |
-} |
313 |
- |
314 |
-src_configure() { |
315 |
- local mycmakeargs=( |
316 |
- -DREVISION=${PV%%_*} |
317 |
- $(usex luajit '-DWITH_LUAJIT=1' '' '' '') |
318 |
- ) |
319 |
- |
320 |
- cmake-utils_src_configure |
321 |
-} |
322 |
- |
323 |
-src_install() { |
324 |
- cmake-utils_src_install |
325 |
- python_fix_shebang "${ED}" |
326 |
-} |
327 |
|
328 |
diff --git a/dev-util/bcc/files/bcc-0.9.0-system-libbpf.patch b/dev-util/bcc/files/bcc-0.9.0-system-libbpf.patch |
329 |
deleted file mode 100644 |
330 |
index 18868272dcb..00000000000 |
331 |
--- a/dev-util/bcc/files/bcc-0.9.0-system-libbpf.patch |
332 |
+++ /dev/null |
333 |
@@ -1,100 +0,0 @@ |
334 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
335 |
-index 94aac856..33492c27 100644 |
336 |
---- a/CMakeLists.txt |
337 |
-+++ b/CMakeLists.txt |
338 |
-@@ -61,6 +61,9 @@ FOREACH(DIR ${LLVM_INCLUDE_DIRS}) |
339 |
- include_directories("${DIR}/../tools/clang/include") |
340 |
- ENDFOREACH() |
341 |
- |
342 |
-+find_package(PkgConfig) |
343 |
-+pkg_check_modules(LIBBPF REQUIRED libbpf) |
344 |
-+ |
345 |
- # Set to a string path if system places kernel lib directory in |
346 |
- # non-default location. |
347 |
- if(NOT DEFINED BCC_KERNEL_MODULES_DIR) |
348 |
-diff --git a/introspection/CMakeLists.txt b/introspection/CMakeLists.txt |
349 |
-index 88df6e84..a4033c02 100644 |
350 |
---- a/introspection/CMakeLists.txt |
351 |
-+++ b/introspection/CMakeLists.txt |
352 |
-@@ -8,6 +8,6 @@ include_directories(${CMAKE_SOURCE_DIR}/src/cc/libbpf/include/uapi) |
353 |
- option(INSTALL_INTROSPECTION "Install BPF introspection tools" ON) |
354 |
- |
355 |
- add_executable(bps bps.c) |
356 |
--target_link_libraries(bps bpf-static) |
357 |
-+target_link_libraries(bps bpf-static ${LIBBPF_LIBRARIES}) |
358 |
- |
359 |
- install (TARGETS bps DESTINATION share/bcc/introspection) |
360 |
-diff --git a/src/cc/CMakeLists.txt b/src/cc/CMakeLists.txt |
361 |
-index 59a59856..2af70525 100644 |
362 |
---- a/src/cc/CMakeLists.txt |
363 |
-+++ b/src/cc/CMakeLists.txt |
364 |
-@@ -28,7 +28,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DLLVM_MAJOR_VERSION=${CMAKE_MATCH_1}") |
365 |
- |
366 |
- include(static_libstdc++) |
367 |
- |
368 |
--file(GLOB libbpf_sources "libbpf/src/*.c") |
369 |
-+#file(GLOB libbpf_sources "libbpf/src/*.c") |
370 |
- add_library(bpf-static STATIC libbpf.c perf_reader.c ${libbpf_sources}) |
371 |
- set_target_properties(bpf-static PROPERTIES OUTPUT_NAME bpf) |
372 |
- add_library(bpf-shared SHARED libbpf.c perf_reader.c ${libbpf_sources}) |
373 |
-@@ -81,10 +81,10 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${llvm_lib_exclude_f |
374 |
- # bcc_common_libs_for_s for shared libraries |
375 |
- set(bcc_common_libs_for_a b_frontend clang_frontend bpf-static |
376 |
- -Wl,--whole-archive ${clang_libs} ${llvm_libs} -Wl,--no-whole-archive |
377 |
-- ${LIBELF_LIBRARIES}) |
378 |
-+ ${LIBELF_LIBRARIES} ${LIBBPF_LIBRARIES}) |
379 |
- set(bcc_common_libs_for_s ${bcc_common_libs_for_a}) |
380 |
- set(bcc_common_libs_for_lua b_frontend clang_frontend bpf-static |
381 |
-- ${clang_libs} ${llvm_libs} ${LIBELF_LIBRARIES}) |
382 |
-+ ${clang_libs} ${llvm_libs} ${LIBELF_LIBRARIES} ${LIBBPF_LIBRARIES}) |
383 |
- |
384 |
- if(ENABLE_CPP_API) |
385 |
- add_subdirectory(api) |
386 |
-@@ -115,4 +115,3 @@ install(DIRECTORY libbpf/include/uapi/linux/ DESTINATION include/bcc/compat/linu |
387 |
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libbcc.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) |
388 |
- endif(ENABLE_CLANG_JIT) |
389 |
- install(FILES ${bcc_common_headers} DESTINATION include/bcc) |
390 |
--install(TARGETS bpf-shared LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
391 |
-diff --git a/src/cc/bcc_btf.cc b/src/cc/bcc_btf.cc |
392 |
-index 881959af..62f73f54 100644 |
393 |
---- a/src/cc/bcc_btf.cc |
394 |
-+++ b/src/cc/bcc_btf.cc |
395 |
-@@ -19,8 +19,8 @@ |
396 |
- #include <string.h> |
397 |
- #include "linux/btf.h" |
398 |
- #include "libbpf.h" |
399 |
--#include "libbpf/src/libbpf.h" |
400 |
--#include "libbpf/src/btf.h" |
401 |
-+#include <bpf/libbpf.h> |
402 |
-+#include <bpf/btf.h> |
403 |
- #include <vector> |
404 |
- |
405 |
- #define BCC_MAX_ERRNO 4095 |
406 |
-diff --git a/src/cc/bpf_module.cc b/src/cc/bpf_module.cc |
407 |
-index cf6ea8f3..1be7b788 100644 |
408 |
---- a/src/cc/bpf_module.cc |
409 |
-+++ b/src/cc/bpf_module.cc |
410 |
-@@ -43,7 +43,7 @@ |
411 |
- #include "exported_files.h" |
412 |
- #include "libbpf.h" |
413 |
- #include "bcc_btf.h" |
414 |
--#include "libbpf/src/bpf.h" |
415 |
-+#include <bpf/bpf.h> |
416 |
- |
417 |
- namespace ebpf { |
418 |
- |
419 |
-diff --git a/src/cc/libbpf.c b/src/cc/libbpf.c |
420 |
-index 9b0024dc..7b3eca4b 100644 |
421 |
---- a/src/cc/libbpf.c |
422 |
-+++ b/src/cc/libbpf.c |
423 |
-@@ -51,8 +51,8 @@ |
424 |
- // TODO: Remove this when CentOS 6 support is not needed anymore |
425 |
- #include "setns.h" |
426 |
- |
427 |
--#include "libbpf/src/bpf.h" |
428 |
--#include "libbpf/src/libbpf.h" |
429 |
-+#include <bpf/bpf.h> |
430 |
-+#include <bpf/libbpf.h> |
431 |
- |
432 |
- // TODO: remove these defines when linux-libc-dev exports them properly |
433 |
- |