[gentoo-commits] repo/gentoo:master commit in: dev-util/bcc/files/
commit: 3c0ddf21d82d14b1a9a4dda68c39e74469e5b552 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Sun Jan 8 15:14:33 2023 + Commit: Patrick McLean gentoo org> CommitDate: Sun Jan 8 21:20:01 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c0ddf21 dev-util/bcc: remove unused patch Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/29013 Signed-off-by: Patrick McLean gentoo.org> dev-util/bcc/files/bcc-0.14.0-cmakelists.patch | 19 --- 1 file changed, 19 deletions(-) diff --git a/dev-util/bcc/files/bcc-0.14.0-cmakelists.patch b/dev-util/bcc/files/bcc-0.14.0-cmakelists.patch deleted file mode 100644 index 3155e3cee96e.. --- a/dev-util/bcc/files/bcc-0.14.0-cmakelists.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 65e78ffe..837b4939 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -3,14 +3,6 @@ - cmake_minimum_required(VERSION 2.8.7) - - project(bcc) --if(NOT CMAKE_BUILD_TYPE) -- set(CMAKE_BUILD_TYPE Release) --endif() -- --if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) -- set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "path to install" FORCE) --endif() -- - enable_testing() - - # populate submodules (libbpf)
[gentoo-commits] repo/gentoo:master commit in: dev-util/bcc/files/, dev-util/bcc/
commit: 43e482150437ac4a792fdbc3b6e1e527cd51f157 Author: Patrick McLean gentoo org> AuthorDate: Wed Aug 10 19:38:35 2022 + Commit: Patrick McLean gentoo org> CommitDate: Wed Aug 10 19:38:35 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43e48215 dev-util/bcc: add 0.25.0 Closes: https://bugs.gentoo.org/853649 Signed-off-by: Patrick McLean gentoo.org> dev-util/bcc/Manifest | 1 + dev-util/bcc/bcc-0.25.0.ebuild | 137 + dev-util/bcc/files/bcc-0.25.0-cmakelists.patch | 15 +++ 3 files changed, 153 insertions(+) diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest index 021b7eeff65b..73a6230bfb09 100644 --- a/dev-util/bcc/Manifest +++ b/dev-util/bcc/Manifest @@ -1 +1,2 @@ DIST bcc-0.24.0.tar.gz 4640711 BLAKE2B 91d333c21c55de6a0ae78f9bb0b003803578525746e63ca5047896c0b2ed03ee880e03a84511470576e888e46559c67a8ebfdfe49d8785d094e2361bb20c5c2e SHA512 951672e3a8e5ad56eedf513477317ec3d3b4cf2d594bbfce20f3d19ddf7ce255e9dcfc69d9b05bb765a16e769c8e42d7c57071ddb86fb32437f527d3d25d19b6 +DIST bcc-0.25.0.tar.gz 4984989 BLAKE2B 7547e3db293c1eef617b3bb58231f40a4bd3d58f425666dcb58bf77a69d74b468f07d07e01cdf2be89820318c9f3c213047b2d6dd654e08e6a60a3ecc2573252 SHA512 9f71f6c21d1f66054985562168d5848352f5029383e9c65c907a6f044258bc23df842cc65db20bfaaf33789e69c9b8e7b606a32dc882cbdf093b71768c8b521d diff --git a/dev-util/bcc/bcc-0.25.0.ebuild b/dev-util/bcc/bcc-0.25.0.ebuild new file mode 100644 index ..1b1af6260a0c --- /dev/null +++ b/dev-util/bcc/bcc-0.25.0.ebuild @@ -0,0 +1,137 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( luajit ) +PYTHON_COMPAT=( python3_{8..11} ) +LLVM_MAX_SLOT=14 + +inherit cmake linux-info llvm lua-single python-r1 toolchain-funcs + +DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more" +HOMEPAGE="https://iovisor.github.io/bcc/; +SRC_URI="https://github.com/iovisor/bcc/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="+lua test" + +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + lua? ( ${LUA_REQUIRED_USE} ) +" + +# tests need root access +RESTRICT="test" + +RDEPEND=" + >=dev-libs/elfutils-0.166:= + >=dev-libs/libbpf-0.7.0:=[static-libs(-)] + sys-kernel/linux-headers +
[gentoo-commits] repo/gentoo:master commit in: dev-util/bcc/files/, dev-util/bcc/
commit: 27ab4d5777819f4e5c1f47cdaed71322c069b90e Author: Patrick McLean gentoo org> AuthorDate: Thu Dec 2 21:45:06 2021 + Commit: Patrick McLean gentoo org> CommitDate: Thu Dec 2 21:45:14 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27ab4d57 dev-util/bcc: Revbump, add MANPATH, fix compression (bug #828030) Closes: https://bugs.gentoo.org/828030 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Patrick McLean gentoo.org> .../bcc/{bcc-0.23.0-r1.ebuild => bcc-0.23.0-r2.ebuild} | 7 +++ dev-util/bcc/files/bcc-0.23.0-man-compress.patch | 18 ++ 2 files changed, 25 insertions(+) diff --git a/dev-util/bcc/bcc-0.23.0-r1.ebuild b/dev-util/bcc/bcc-0.23.0-r2.ebuild similarity index 94% rename from dev-util/bcc/bcc-0.23.0-r1.ebuild rename to dev-util/bcc/bcc-0.23.0-r2.ebuild index c9b8d16482cd..d66f44f767de 100644 --- a/dev-util/bcc/bcc-0.23.0-r1.ebuild +++ b/dev-util/bcc/bcc-0.23.0-r2.ebuild @@ -48,6 +48,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch" "${FILESDIR}/bcc-0.14.0-cmakelists.patch" + "${FILESDIR}/bcc-0.23.0-man-compress.patch" ) pkg_pretend() { @@ -118,4 +119,10 @@ src_install() { name=${tool##*/} dosym8 -r "${tool#${ED}}" /usr/sbin/${name} done + + docompress /usr/share/${PN}/man + + newenvd - "70${P}" <<-_EOF_ + MANPATH="${EPREFIX}/usr/share/${PN}/man" + _EOF_ } diff --git a/dev-util/bcc/files/bcc-0.23.0-man-compress.patch b/dev-util/bcc/files/bcc-0.23.0-man-compress.patch new file mode 100644 index ..a7164e72b602 --- /dev/null +++ b/dev-util/bcc/files/bcc-0.23.0-man-compress.patch @@ -0,0 +1,18 @@ +diff --git a/man/man8/CMakeLists.txt b/man/man8/CMakeLists.txt +index 718c7006..3fb623ff 100644 +--- a/man/man8/CMakeLists.txt b/man/man8/CMakeLists.txt +@@ -1,12 +1,4 @@ + find_program(GZIP gzip) + file(GLOB FILES *.8) +-set(GZFILES "") +-foreach(FIL ${FILES}) +- get_filename_component(NAME ${FIL} NAME) +- add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.gz +-COMMAND ${GZIP} -c ${FIL} > ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.gz +-DEPENDS ${FIL}) +- list(APPEND GZFILES "${CMAKE_CURRENT_BINARY_DIR}/${NAME}.gz") +-endforeach() + add_custom_target(man ALL DEPENDS ${GZFILES}) +-install(FILES ${GZFILES} DESTINATION share/bcc/man/man8) ++install(FILES ${FILES} DESTINATION share/bcc/man/man8)
[gentoo-commits] repo/gentoo:master commit in: dev-util/bcc/files/, dev-util/bcc/
commit: 6f97265a969eaa6d9b846dcb858f4c9d469149e1 Author: Patrick McLean sony com> AuthorDate: Fri Oct 30 19:16:37 2020 + Commit: Patrick McLean gentoo org> CommitDate: Fri Oct 30 21:13:06 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f97265a dev-util/bcc-0.17.0: Version bump Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Patrick McLean gentoo.org> dev-util/bcc/Manifest | 1 + dev-util/bcc/bcc-0.17.0.ebuild | 102 + dev-util/bcc/files/60bcc.env | 1 + 3 files changed, 104 insertions(+) diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest index 8632824ea45..52fb0809ba4 100644 --- a/dev-util/bcc/Manifest +++ b/dev-util/bcc/Manifest @@ -4,6 +4,7 @@ DIST bcc-0.13.0.tar.gz 3928016 BLAKE2B ecaf2dc077a5e0b808ea1d588a89793291ed56de8 DIST bcc-0.14.0.tar.gz 4021098 BLAKE2B 2c66c82e14ee7f858f2e4ff8aa158d03c1580686f4023e920f643454283ed26265ec1e122695a308c4e570c369a0f66e6b0a9347fd9046f2eeb6cd4b536e4dc6 SHA512 216033a6944134c9f9b03a254c83236ff49b02c87808d2719a51a5ebe3b2e3f6b283e905cfbbc85084eab60cf8ef89c3135b4e07ddb9bd83348c69f6e49a84b8 DIST bcc-0.15.0.tar.gz 4056782 BLAKE2B 4ae1ee615111b7fadc29fecc0799e3bd65da4f741c83f86e75b7376dca397ed83e6b159dba149a5e675110a0fae92397c0685085b9691786361cfbedff31d4dd SHA512 d340ff54138cb44f610804edc7c8f7424d7182d81fd48c1e3edc6b45977eca8171b6367242abc4418e1baf2c8d3b53a77d0a408d053f246a0c169ddeeea2a68e DIST bcc-0.16.0.tar.gz 4124285 BLAKE2B 443077ffd5ad02e34d28a86ee64b8ec52fa4a18696295d58e87aaf2aeb833c394047cd0d87b3bf1da52d5512b889f8873b788e8141bdd91c9463e27cf30a1ef6 SHA512 50d09d6d02335a63d7c01c22f16a706584f231ee16973a80df5b640c31b8e25775da13a2bdff9e57c04c7f6181bb8c46cf3bd11c1e59741234024da71c7f6cdb +DIST bcc-0.17.0.tar.gz 4166410 BLAKE2B 6833c7a58ed9e99b58bf147dc499ba7c7c113961ff5c21a3ac388abab8caa01dc2a67378899e26050460c4af851a5ddd8747911bda7c7b405dfcb6df29981f85 SHA512 32f27bdd3d8f3e850e59011bcf662b91842b1dcef94d118a0662ffda3b2c48c97a359d736d01f6d06afd74e3d7a4efda4966c71a5c9146b2076d4fba087a85cf DIST libbpf-0.0.5.tar.gz 160335 BLAKE2B 2cf4a3e6edc002b3a32f9d08bb22a07863d8f6f90472e9593a9e9a93b08a00f0557d5a59fa841325b947e6f7b129232e7cd1fdc906f45de57b0dbe594548f1c2 SHA512 e42f6cc8f834f2d3cf9138d655bd3727b2693850f7f6409ec4d536336bc5fa479a64eefc802a5915e333677eca843f8f1bd0132589bba10bdc89064eee0c DIST libbpf-0.0.6.tar.gz 213791 BLAKE2B 9f0a08cc7bae41f7fa93d5ba2f535f76ce47fe691efb6bac6257b88a5607deb62fa53f59984d83b6070ccd573c902899f7528b376d9acbfd77317659de6ab061 SHA512 1678133d9a2bd1cf13d4d1f9b83bb3f0642de91e3e3c8d785e2993257035573aff39b9a1a457e73d9c4c1c66b6a52544a8ad06ac560766d335428bb3fc421e71 DIST libbpf-0.0.7.tar.gz 262068 BLAKE2B e77ff25449274881ddb9d32f25cd6ad8988e4524102bd109049ee6cfce3e2753fd99ebe2a080f809a4c5422dbf6b17633e4b0cea156f289bf95b92f8375a273c SHA512 c2cbc869b7e11339deab3152a6e2d0b3bba25da513d18d77fb0a698cbe61d6bd48175a58e7dd7a3695fbf27faf48b4f517ac5d3a3c66c086df2e5d1b73a2595d diff --git a/dev-util/bcc/bcc-0.17.0.ebuild b/dev-util/bcc/bcc-0.17.0.ebuild new file mode 100644 index 000..f2b68b2fd87 --- /dev/null +++ b/dev-util/bcc/bcc-0.17.0.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6..9} ) + +inherit cmake linux-info llvm python-r1 + +DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more" +HOMEPAGE="https://iovisor.github.io/bcc/; + +SRC_URI="https://github.com/iovisor/bcc/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="+luajit test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=" + >=dev-libs/libbpf-0.2[static-libs(-)] + >=sys-kernel/linux-headers-4.14 + >=dev-libs/elfutils-0.166:= + <=sys-devel/clang-12:= + <=sys-devel/llvm-12:=[llvm_targets_BPF(+)] + luajit? ( dev-lang/luajit ) + ${PYTHON_DEPS} +" +DEPEND="${RDEPEND} + test? ( + || ( + net-misc/iputils[arping] + net-analyzer/arping + ) + net-analyzer/netperf + net-misc/iperf:* + ) +" +BDEPEND=" + dev-util/cmake + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch" + "${FILESDIR}/bcc-0.14.0-cmakelists.patch" +) + +# tests need root access +RESTRICT="test" + +pkg_pretend() { + local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF + ~EBPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL + ~KPROBES" + + check_extra_config +} + +pkg_setup() { + LLVM_MAX_SLOT=11 llvm_pkg_setup + python_setup +} + +src_prepare() { + local bpf_link_path + + # this avoids bundling + bpf_link_path="$(realpath
[gentoo-commits] repo/gentoo:master commit in: dev-util/bcc/files/, dev-util/bcc/
commit: 0e821488d4d0c35a79ad06e29eafda3baf1636ac Author: Patrick McLean sony com> AuthorDate: Thu Feb 20 19:00:49 2020 + Commit: Patrick McLean gentoo org> CommitDate: Thu Feb 20 19:00:49 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e821488 dev-util/bcc: Remove old versions Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Patrick McLean gentoo.org> dev-util/bcc/Manifest| 6 -- dev-util/bcc/bcc-0.10.0.ebuild | 85 --- dev-util/bcc/bcc-0.6.0.ebuild| 51 dev-util/bcc/bcc-0.7.0.ebuild| 51 dev-util/bcc/bcc-0.9.0-r1.ebuild | 73 - dev-util/bcc/files/bcc-0.9.0-system-libbpf.patch | 100 --- 6 files changed, 366 deletions(-) diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest index 8b05001468e..c2fcfba21e8 100644 --- a/dev-util/bcc/Manifest +++ b/dev-util/bcc/Manifest @@ -1,12 +1,6 @@ -DIST bcc-0.10.0.tar.gz 2052430 BLAKE2B 562aa95d34ba329ce966bca3164af45fe6d78487e5f0d370a0a90c5d91af75b4adcc5aa1e6578bf598e55dc51394c5a218fc19e2b57b2f7241cc3fe1f3a4e513 SHA512 92ba0f57d22af610ac81661526fed8bec80d502bcbc8aa5048ba7c50911247c020832db23afdcf9b555b142cd387c228cf7baa0ddc94067165403e362227f235 DIST bcc-0.11.0.tar.gz 2611511 BLAKE2B db12e10a3da11b1d3691ca5e0e036f56af4c5765d49e2edefc3e30bc90036a5f521d196db797e3725e618efa68ba2550848b3dc044015f6aea6b2da6ca2a34f5 SHA512 4854a5a15a89a8bd3a10daa6f0e831428316751280902cbdc74f3c6f78263ee1c58521ae9125804e72fec6482702818a5fec781436400640627e4b7c2fc189fb DIST bcc-0.12.0.tar.gz 2627075 BLAKE2B 44c435eaaf6233ad24249cf5da4e778cd31e41573199ded97d1f411c7424128fb11f838c55fa48c692b4d5f267ea594d6cab9992dc76137da1b41453285c98c5 SHA512 db3ea929b1296f4d9d82d2a11e89e11a1c31512d3f7f935475a7613e0128a5cf9441f3138969535ef41de0c0f677c7446f62f1c64575d41a9896e5339f3f112b DIST bcc-0.13.0.tar.gz 3928016 BLAKE2B ecaf2dc077a5e0b808ea1d588a89793291ed56de8747e1cb59f0e841b70e4a4f0333e2941ee2b42b5b9a570cd8d4f9941be772e7790186be156e452a416d40bb SHA512 7c82007979814ac11d1dfc81fe8e00d988f518f7fbba3e115851e17500c22eca23b33b84f9053acc10aefda0ee3b80429f8daf1389590c2d3686ee8d7ced72cb -DIST bcc-0.6.0.tar.gz 1986593 BLAKE2B 514c2c781eb94d99560232d8050b5664ce3565622b236e78cd111be27b3482849965600a1d574f59243917672f00bb3cef65cab63103f6c4a5cf62024c683d9b SHA512 1a8edf6da22f3119a74cf43f03ec83b97ed2f6fc18828d750d8a695ac1451b6b3209e5d2cf48bc87f53fa9447e8813a018a58d31588d477e4aa364a2d0217e80 -DIST bcc-0.7.0.tar.gz 2009289 BLAKE2B 370b553521289d983d1165633e76a5e405250b9b09dbf3e78c127d232908e73facce06097ce4dbf0bbccda929b6715a9b7460affe123556087c8ca00b8d62c0b SHA512 ebe6c4cbecba2d587c69af71ddc8cb451b2b8e1d49ef887f291c813320c2c60d49357500fc2751d5b418df2be1d02763c385d89de6efa6e10f049c25acf01b4e -DIST bcc-0.9.0-linux-5-bpf.patch.xz 28524 BLAKE2B f0369e50eabd7b1eb9a492b9652cd7647c7c7fda3b01db1e7f2bf716e76357d07d67193b31189b98309e26895ac3dd5c755d4cef6bc592e4674f40710c33539c SHA512 fc5b828a5826da2cf1e1a76758c635f5443d202aecbe3f269d78abcaa0117ad7658bea6c43e7b60e1ecc6bcc65bd19b100217758a1203d278ddb03c5837c43f1 -DIST bcc-0.9.0.tar.gz 2036984 BLAKE2B cebbeb57f06af90442d28be1633a54c198bf796786c4fcca3a83dea03bc76949f958dd24f7d85feb2e3402576410f965754f3d031076486b7d378493c56035e8 SHA512 373080181380ec3bcb13469e29ff1f792e924a2df00a614da4647ed54060ad216525dd0f49c5d0afba7946a6d2f4e3475af97250a33db825945af3d165294091 -DIST libbpf-0.0.3.tar.gz 127328 BLAKE2B eaa1be54f0a7fcc6fd41eb2adaad2f405f76db3bd7c7466a5484ead1cca5a9fe775e331838cd5645d7399cb5b1a5b2fcb3814fb45643660fd3f7d84b9986bae6 SHA512 ee489d968cd9a20a1f091dcd2696d3807ab0db2a001613684402de2c696391eea033f3bd961eaf1d0df95c1e15f4f0ccfb7003ff98c3f08f24a7e9a8db22cdad DIST libbpf-0.0.5.tar.gz 160335 BLAKE2B 2cf4a3e6edc002b3a32f9d08bb22a07863d8f6f90472e9593a9e9a93b08a00f0557d5a59fa841325b947e6f7b129232e7cd1fdc906f45de57b0dbe594548f1c2 SHA512 e42f6cc8f834f2d3cf9138d655bd3727b2693850f7f6409ec4d536336bc5fa479a64eefc802a5915e333677eca843f8f1bd0132589bba10bdc89064eee0c DIST libbpf-0.0.6.tar.gz 213791 BLAKE2B 9f0a08cc7bae41f7fa93d5ba2f535f76ce47fe691efb6bac6257b88a5607deb62fa53f59984d83b6070ccd573c902899f7528b376d9acbfd77317659de6ab061 SHA512 1678133d9a2bd1cf13d4d1f9b83bb3f0642de91e3e3c8d785e2993257035573aff39b9a1a457e73d9c4c1c66b6a52544a8ad06ac560766d335428bb3fc421e71 DIST libbpf-0.0.7.tar.gz 262068 BLAKE2B e77ff25449274881ddb9d32f25cd6ad8988e4524102bd109049ee6cfce3e2753fd99ebe2a080f809a4c5422dbf6b17633e4b0cea156f289bf95b92f8375a273c SHA512 c2cbc869b7e11339deab3152a6e2d0b3bba25da513d18d77fb0a698cbe61d6bd48175a58e7dd7a3695fbf27faf48b4f517ac5d3a3c66c086df2e5d1b73a2595d diff --git a/dev-util/bcc/bcc-0.10.0.ebuild b/dev-util/bcc/bcc-0.10.0.ebuild deleted file mode 100644 index 08138b6375b..000 --- a/dev-util/bcc/bcc-0.10.0.ebuild +++ /dev/null @@
[gentoo-commits] repo/gentoo:master commit in: dev-util/bcc/files/
commit: 59d23246a7a88801ea4af77787697b452b8da23f Author: Michael Mair-Keimberger gmail com> AuthorDate: Tue Oct 29 09:19:21 2019 + Commit: Zac Medico gentoo org> CommitDate: Tue Oct 29 17:40:03 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59d23246 dev-util/bcc: remove unused patch Closes: https://github.com/gentoo/gentoo/pull/13483 Signed-off-by: Michael Mair-Keimberger gmail.com> Signed-off-by: Zac Medico gentoo.org> dev-util/bcc/files/bcc-0.10.0-system-libbpf.patch | 182 -- 1 file changed, 182 deletions(-) diff --git a/dev-util/bcc/files/bcc-0.10.0-system-libbpf.patch b/dev-util/bcc/files/bcc-0.10.0-system-libbpf.patch deleted file mode 100644 index fabb3f3f2e6..000 --- a/dev-util/bcc/files/bcc-0.10.0-system-libbpf.patch +++ /dev/null @@ -1,182 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 94aac856..bd454226 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -9,12 +9,6 @@ endif() - - enable_testing() - --# populate submodules (libbpf) --if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/src/cc/libbpf/src) -- execute_process(COMMAND git submodule update --init --recursive -- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) --endif() -- - include(cmake/GetGitRevisionDescription.cmake) - include(cmake/version.cmake) - include(CMakeDependentOption) -@@ -61,6 +55,9 @@ FOREACH(DIR ${LLVM_INCLUDE_DIRS}) - include_directories("${DIR}/../tools/clang/include") - ENDFOREACH() - -+find_package(PkgConfig) -+pkg_check_modules(LIBBPF REQUIRED libbpf) -+ - # Set to a string path if system places kernel lib directory in - # non-default location. - if(NOT DEFINED BCC_KERNEL_MODULES_DIR) -diff --git a/examples/cpp/CMakeLists.txt b/examples/cpp/CMakeLists.txt -index 906c9aaf..210f0f75 100644 a/examples/cpp/CMakeLists.txt -+++ b/examples/cpp/CMakeLists.txt -@@ -3,7 +3,7 @@ - - include_directories(${CMAKE_SOURCE_DIR}/src/cc) - include_directories(${CMAKE_SOURCE_DIR}/src/cc/api) --include_directories(${CMAKE_SOURCE_DIR}/src/cc/libbpf/include/uapi) -+include_directories(${LIBBPF_INCLUDE_DIRS}) - - option(INSTALL_CPP_EXAMPLES "Install C++ examples. Those binaries are statically linked and can take plenty of disk space" OFF) - -diff --git a/examples/cpp/pyperf/CMakeLists.txt b/examples/cpp/pyperf/CMakeLists.txt -index 6f963c66..e8dd66f6 100644 a/examples/cpp/pyperf/CMakeLists.txt -+++ b/examples/cpp/pyperf/CMakeLists.txt -@@ -3,7 +3,7 @@ - - include_directories(${CMAKE_SOURCE_DIR}/src/cc) - include_directories(${CMAKE_SOURCE_DIR}/src/cc/api) --include_directories(${CMAKE_SOURCE_DIR}/src/cc/libbpf/include/uapi) -+include_directories(${LIBBPF_INCLUDE_DIRS}) - - add_executable(PyPerf PyPerf.cc PyPerfUtil.cc PyPerfBPFProgram.cc PyPerfLoggingHelper.cc PyPerfDefaultPrinter.cc Py36Offsets.cc) - target_link_libraries(PyPerf bcc-static) -diff --git a/introspection/CMakeLists.txt b/introspection/CMakeLists.txt -index 88df6e84..de8a6464 100644 a/introspection/CMakeLists.txt -+++ b/introspection/CMakeLists.txt -@@ -3,11 +3,11 @@ - - include_directories(${CMAKE_SOURCE_DIR}/src/cc) - include_directories(${CMAKE_SOURCE_DIR}/src/cc/api) --include_directories(${CMAKE_SOURCE_DIR}/src/cc/libbpf/include/uapi) -+include_directories(${LIBBPF_INCLUDE_DIRS}) - - option(INSTALL_INTROSPECTION "Install BPF introspection tools" ON) - - add_executable(bps bps.c) --target_link_libraries(bps bpf-static) -+target_link_libraries(bps ${LIBBPF_LIBRARIES}) - - install (TARGETS bps DESTINATION share/bcc/introspection) -diff --git a/src/cc/CMakeLists.txt b/src/cc/CMakeLists.txt -index bd34fd48..dfbeb596 100644 a/src/cc/CMakeLists.txt -+++ b/src/cc/CMakeLists.txt -@@ -10,8 +10,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/frontends/clang) - include_directories(${LLVM_INCLUDE_DIRS}) - include_directories(${LIBELF_INCLUDE_DIRS}) - # todo: if check for kernel version --include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libbpf/include) --include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libbpf/include/uapi) -+include_directories(${LIBBPF_INCLUDE_DIRS}) - add_definitions(${LLVM_DEFINITIONS}) - configure_file(libbcc.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libbcc.pc @ONLY) - -@@ -28,13 +27,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DLLVM_MAJOR_VERSION=${CMAKE_MATCH_1}") - - include(static_libstdc++) - --file(GLOB libbpf_sources "libbpf/src/*.c") --add_library(bpf-static STATIC libbpf.c perf_reader.c ${libbpf_sources}) --set_target_properties(bpf-static PROPERTIES OUTPUT_NAME bcc_bpf) --add_library(bpf-shared SHARED libbpf.c perf_reader.c ${libbpf_sources}) --set_target_properties(bpf-shared PROPERTIES VERSION ${REVISION_LAST} SOVERSION 0) --set_target_properties(bpf-shared PROPERTIES OUTPUT_NAME bcc_bpf) -- - set(bcc_common_sources bcc_common.cc bpf_module.cc bcc_btf.cc exported_files.cc) - if (${LLVM_PACKAGE_VERSION} VERSION_EQUAL 6 OR ${LLVM_PACKAGE_VERSION} VERSION_GREATER 6) - set(bcc_common_sources