From ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 29 Feb 2020 18:01:47 +0000 Subject: gentoo (leap year) resync : 29.02.2020 --- dev-util/bcc/Manifest | 14 +--- dev-util/bcc/bcc-0.10.0.ebuild | 85 ------------------- dev-util/bcc/bcc-0.13.0.ebuild | 91 +++++++++++++++++++++ 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 ----------------------- 7 files changed, 94 insertions(+), 371 deletions(-) delete mode 100644 dev-util/bcc/bcc-0.10.0.ebuild create mode 100644 dev-util/bcc/bcc-0.13.0.ebuild delete mode 100644 dev-util/bcc/bcc-0.6.0.ebuild delete mode 100644 dev-util/bcc/bcc-0.7.0.ebuild delete mode 100644 dev-util/bcc/bcc-0.9.0-r1.ebuild delete mode 100644 dev-util/bcc/files/bcc-0.9.0-system-libbpf.patch (limited to 'dev-util/bcc') diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest index 3872722426ce..e2e9b72cf552 100644 --- a/dev-util/bcc/Manifest +++ b/dev-util/bcc/Manifest @@ -1,19 +1,11 @@ AUX bcc-0.9.0-no-luajit-automagic-dep.patch 463 BLAKE2B 286ed298055cbdb22d9c3f3f064c77da685cf75cc8c0ab0cad4d4b473f0eac0b1533ca8eb7e6159108d184d16db7a264b0ea9d30ccdc3d988d88bab28be7310d SHA512 6e5c20de22547410ffa566cb8226a47ee0e8c91183bc5b70eb22637a08fe55cfc96fde169ef3ab8d6e8d7c9e356c35e61b164b3ad675835d3ea8d5239a448979 -AUX bcc-0.9.0-system-libbpf.patch 3629 BLAKE2B e3fd70ccd29126bd2ac8582d8094ef0317dbc9dafc8924a05d994105573a6bd1bf382cbd3d6a0bb25390abc3b4ca3edc70293f4663337ccc203434ba380648dd SHA512 e7ca33a66ffbe4cb4b4bf169029d2325b4321018832803872a7fc7f1e99a75338e34bfe55a072f717d45f9759adf119ed5289f0febd45f81303c178999ef5dc7 -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.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 bcc-0.13.0.tar.gz 3928016 BLAKE2B ecaf2dc077a5e0b808ea1d588a89793291ed56de8747e1cb59f0e841b70e4a4f0333e2941ee2b42b5b9a570cd8d4f9941be772e7790186be156e452a416d40bb SHA512 7c82007979814ac11d1dfc81fe8e00d988f518f7fbba3e115851e17500c22eca23b33b84f9053acc10aefda0ee3b80429f8daf1389590c2d3686ee8d7ced72cb DIST libbpf-0.0.5.tar.gz 160335 BLAKE2B 2cf4a3e6edc002b3a32f9d08bb22a07863d8f6f90472e9593a9e9a93b08a00f0557d5a59fa841325b947e6f7b129232e7cd1fdc906f45de57b0dbe594548f1c2 SHA512 e42f6cc8f834f2d3cf9138d655bd3727ffffb2693850f7f6409ec4d536336bc5fa479a64eefc802a5915e333677eca843f8f1bd0132589bba10bdc89064eee0c DIST libbpf-0.0.6.tar.gz 213791 BLAKE2B 9f0a08cc7bae41f7fa93d5ba2f535f76ce47fe691efb6bac6257b88a5607deb62fa53f59984d83b6070ccd573c902899f7528b376d9acbfd77317659de6ab061 SHA512 1678133d9a2bd1cf13d4d1f9b83bb3f0642de91e3e3c8d785e2993257035573aff39b9a1a457e73d9c4c1c66b6a52544a8ad06ac560766d335428bb3fc421e71 -EBUILD bcc-0.10.0.ebuild 1861 BLAKE2B d5c52a182d41f70391075cd4cfeba883a51eed88307c945d97d9a76f65071a6f2c87b740078d3c2d4951169a668e874bc3d646c0bc5ee4496f188ca450fb7b4c SHA512 1f23b33e218355be4ae7ec60188b5eeb2a58525366857c0c963361aae7df8e0c852bde497d36a80cafc15aeebb3b38513e5c0c9f2e1b649660a0b2438fe2c459 +DIST libbpf-0.0.7.tar.gz 262068 BLAKE2B e77ff25449274881ddb9d32f25cd6ad8988e4524102bd109049ee6cfce3e2753fd99ebe2a080f809a4c5422dbf6b17633e4b0cea156f289bf95b92f8375a273c SHA512 c2cbc869b7e11339deab3152a6e2d0b3bba25da513d18d77fb0a698cbe61d6bd48175a58e7dd7a3695fbf27faf48b4f517ac5d3a3c66c086df2e5d1b73a2595d EBUILD bcc-0.11.0.ebuild 1862 BLAKE2B ed50015774cd375e2bbbf7a5be10ddc53c7864314fbb839027952860e25fafd5bcace7a42936ee316db1e18c13082be994a9b1084d94468f8293b1b780dcb978 SHA512 9701b5a605c19d4fe78ccb68477be41aac1b9fbc9990932e25d28b8e074cc528746893dc7fd70d919366d3b94e83d2b45cf806da94e793b683d07f8611b4d09c EBUILD bcc-0.12.0-r1.ebuild 1886 BLAKE2B f3879a2437abbfc99b87ad1a3a5c1b8b600a9e0213be90ee17ecba036b76798529de61b159dd7af7ce56000e071d44923f2707d366383c5f6ed228fb78b10858 SHA512 492110b8a4dd64c30bf8d8f5af5dce183976ee31d3ee5652efe61e7734c779b8a08d9334fdb2c4c0aa4a90df71a5a1d5374677eb9c9566ce534ee760b135caf5 -EBUILD bcc-0.6.0.ebuild 1102 BLAKE2B ee02e6f71606fdfa2962131343765fa357acc978b1db1c4e71e6b8581ea82779e96162cb35b9a926211aff82bd8e47cb9373b61fc73a6cad6303ac1df8f1b457 SHA512 3f777187c426d54c75bde97df690f1ff413acdd71a583a2850fd574c164797a4a78c667635c4e21f59812173cd356c1d44926923c44a72aafbec257982f0fdbc -EBUILD bcc-0.7.0.ebuild 1106 BLAKE2B 7cb7cb973c6562016373d1960494053b9342e888452a8d96ce5b4aeeedba4e95930d72ab30032640898d05d3c4cc0af9b71d45f5c4b2eb6b426dc300797855b1 SHA512 6e94fbe2bde86853c77de2554aaa1ec2160d67f55a932e4b315acb5cffe7209fe29e079281e813c57869fe409b69e670c15f77afc8400b7c1c4e594da42062e9 -EBUILD bcc-0.9.0-r1.ebuild 1649 BLAKE2B b7dfd851c235f41eaae3457e6e795769075a28ec73fc396e4cce893a2215572bde94410f578427eb79d02442eefb231c59c2f646bc8f0b486a76a5d281ffb355 SHA512 47707d7d2a60562966105c78c7859f1753cf2cb7528c228d4f15ef1f308f8ed1d58cdffea81718fa5df43433d7aa9339631bf42304378b816b46739374b8cdf9 +EBUILD bcc-0.13.0.ebuild 1888 BLAKE2B c43af37e8c32cf9005b377fb38c6818f1aa63abf11431c8b91985ec87a71e4b6672c91b4efbf186a1806c4b61e842953fed81c5905ad3422e3008486d552b3a3 SHA512 355813905e0ec9cbfb901773245aabfa3785d4dc5c5ed4f3a01d89f30a2ea1b166cace609f49c024a31704b75c1f72f037958f251d296aef0c367c8dbb0f1ca4 MISC metadata.xml 386 BLAKE2B 73062e6902dd7d7f9afb988cce26a8aa5a66e1252652ae364f2295b0a5e77013eec682b36ab65c93772843ad0ec8c7187cd29d8308a3ba17dbacd1ef193f03ae SHA512 6529fa57011cd17b9892e1b8f05e063ae6314f85665a30881335efa80e9b9238a7b61d1f732316e45496707bf350d03149e7ec5efdf1a0fee6d5a788b58a7e70 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 08138b6375b2..000000000000 --- a/dev-util/bcc/bcc-0.10.0.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7} ) - -inherit cmake-utils linux-info python-single-r1 - -EGIT_COMMIT="v${PV}" -LIBBPF_VER="0.0.3" - -DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more" -HOMEPAGE="https://iovisor.github.io/bcc/" - -# This bundles libbpf, I tried to unbundle it, but I am not good enough -# with cmake to do it. Patches accepted... -SRC_URI="https://github.com/iovisor/bcc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz - https://github.com/libbpf/libbpf/archive/${LIBBPF_VER}.tar.gz -> libbpf-${LIBBPF_VER}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="+luajit test" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=">=sys-kernel/linux-headers-4.18 - >=dev-libs/elfutils-0.166:= - sys-devel/clang:= - >=sys-devel/llvm-3.7.1:=[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" - -S=${WORKDIR}/${PN}-${EGIT_COMMIT#v} - -PATCHES=( - "${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch" -) - -# tests need root access -RESTRICT="test" - -pkg_pretend() { - local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF - ~BPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL - ~KPROBES" - - check_extra_config -} - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - rmdir src/cc/libbpf || die - mv "${WORKDIR}"/libbpf-${LIBBPF_VER} src/cc/libbpf || die - - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DREVISION=${PV%%_*} - $(usex luajit '-DWITH_LUAJIT=1' '' '' '') - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - python_fix_shebang "${ED}" -} diff --git a/dev-util/bcc/bcc-0.13.0.ebuild b/dev-util/bcc/bcc-0.13.0.ebuild new file mode 100644 index 000000000000..8ff7d3262f47 --- /dev/null +++ b/dev-util/bcc/bcc-0.13.0.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit cmake-utils linux-info python-single-r1 + +EGIT_COMMIT="v${PV}" +LIBBPF_VER="0.0.7" + +DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more" +HOMEPAGE="https://iovisor.github.io/bcc/" + +# This bundles libbpf, I tried to unbundle it, but I am not good enough +# with cmake to do it. Patches accepted... +SRC_URI="https://github.com/iovisor/bcc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz + https://github.com/libbpf/libbpf/archive/v${LIBBPF_VER}.tar.gz -> libbpf-${LIBBPF_VER}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="+luajit test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=" + >=sys-kernel/linux-headers-4.14 + >=dev-libs/elfutils-0.166:= + sys-devel/clang:= + >=sys-devel/llvm-3.7.1:=[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 +" + +S=${WORKDIR}/${PN}-${EGIT_COMMIT#v} + +PATCHES=( + "${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch" +) + +# tests need root access +RESTRICT="test" + +pkg_pretend() { + local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF + ~BPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL + ~KPROBES" + + check_extra_config +} + +pkg_setup() { + python-single-r1_pkg_setup +} + +src_prepare() { + rmdir src/cc/libbpf || die + mv "${WORKDIR}"/libbpf-${LIBBPF_VER} src/cc/libbpf || die + + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DREVISION=${PV%%_*} + $(usex luajit '-DWITH_LUAJIT=1' '' '' '') + ) + + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + python_fix_shebang "${ED}" + python_optimize +} diff --git a/dev-util/bcc/bcc-0.6.0.ebuild b/dev-util/bcc/bcc-0.6.0.ebuild deleted file mode 100644 index deff44f3e73d..000000000000 --- a/dev-util/bcc/bcc-0.6.0.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_6 ) - -inherit cmake-utils linux-info python-single-r1 - -DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more" -HOMEPAGE="https://iovisor.github.io/bcc/" -EGIT_COMMIT="v${PV}" -SRC_URI="https://github.com/iovisor/bcc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" -RESTRICT="test" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=">=dev-libs/elfutils-0.166:= - sys-devel/clang:= - >=sys-devel/llvm-3.7:=[llvm_targets_BPF(+)] - ${PYTHON_DEPS}" -DEPEND="${RDEPEND}" -S=${WORKDIR}/${PN}-${EGIT_COMMIT#v} - -pkg_pretend() { - local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF - ~BPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL" - - check_extra_config -} - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_configure() { - local mycmakeargs=( - -DREVISION=${PV%%_*} - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - python_fix_shebang "${ED}" -} diff --git a/dev-util/bcc/bcc-0.7.0.ebuild b/dev-util/bcc/bcc-0.7.0.ebuild deleted file mode 100644 index 718f0921ce94..000000000000 --- a/dev-util/bcc/bcc-0.7.0.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{6,7} ) - -inherit cmake-utils linux-info python-single-r1 - -DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more" -HOMEPAGE="https://iovisor.github.io/bcc/" -EGIT_COMMIT="v${PV}" -SRC_URI="https://github.com/iovisor/bcc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" -RESTRICT="test" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=">=dev-libs/elfutils-0.166:= - sys-devel/clang:= - >=sys-devel/llvm-3.7:=[llvm_targets_BPF(+)] - ${PYTHON_DEPS}" -DEPEND="${RDEPEND}" -S=${WORKDIR}/${PN}-${EGIT_COMMIT#v} - -pkg_pretend() { - local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF - ~BPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL" - - check_extra_config -} - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_configure() { - local mycmakeargs=( - -DREVISION=${PV%%_*} - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - python_fix_shebang "${ED}" -} diff --git a/dev-util/bcc/bcc-0.9.0-r1.ebuild b/dev-util/bcc/bcc-0.9.0-r1.ebuild deleted file mode 100644 index 86203a8d50dc..000000000000 --- a/dev-util/bcc/bcc-0.9.0-r1.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7} ) - -inherit cmake-utils linux-info python-single-r1 - -DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more" -HOMEPAGE="https://iovisor.github.io/bcc/" -EGIT_COMMIT="v${PV}" -SRC_URI="https://github.com/iovisor/bcc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz - mirror://gentoo/bcc-0.9.0-linux-5-bpf.patch.xz" -RESTRICT="test" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="+luajit" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="dev-libs/libbpf:= - >=sys-kernel/linux-headers-4.18 - >=dev-libs/elfutils-0.166:= - sys-devel/clang:= - >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] - luajit? ( dev-lang/luajit ) - ${PYTHON_DEPS}" -DEPEND="${RDEPEND}" -BDEPEND="dev-util/cmake - virtual/pkgconfig" - -S=${WORKDIR}/${PN}-${EGIT_COMMIT#v} - -PATCHES=( - "${FILESDIR}/bcc-0.9.0-system-libbpf.patch" - "${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch" -) - -pkg_pretend() { - local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF - ~BPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL - ~KPROBES" - - check_extra_config -} - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - # needs bpf.h from linux-5.0 to build - has_version '>=sys-kernel/linux-headers-5.0' || \ - eapply "${WORKDIR}/bcc-0.9.0-linux-5-bpf.patch" - - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DREVISION=${PV%%_*} - $(usex luajit '-DWITH_LUAJIT=1' '' '' '') - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - python_fix_shebang "${ED}" -} 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 deleted file mode 100644 index 18868272dcbe..000000000000 --- a/dev-util/bcc/files/bcc-0.9.0-system-libbpf.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 94aac856..33492c27 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -61,6 +61,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/introspection/CMakeLists.txt b/introspection/CMakeLists.txt -index 88df6e84..a4033c02 100644 ---- a/introspection/CMakeLists.txt -+++ b/introspection/CMakeLists.txt -@@ -8,6 +8,6 @@ include_directories(${CMAKE_SOURCE_DIR}/src/cc/libbpf/include/uapi) - option(INSTALL_INTROSPECTION "Install BPF introspection tools" ON) - - add_executable(bps bps.c) --target_link_libraries(bps bpf-static) -+target_link_libraries(bps bpf-static ${LIBBPF_LIBRARIES}) - - install (TARGETS bps DESTINATION share/bcc/introspection) -diff --git a/src/cc/CMakeLists.txt b/src/cc/CMakeLists.txt -index 59a59856..2af70525 100644 ---- a/src/cc/CMakeLists.txt -+++ b/src/cc/CMakeLists.txt -@@ -28,7 +28,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DLLVM_MAJOR_VERSION=${CMAKE_MATCH_1}") - - include(static_libstdc++) - --file(GLOB libbpf_sources "libbpf/src/*.c") -+#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 bpf) - add_library(bpf-shared SHARED libbpf.c perf_reader.c ${libbpf_sources}) -@@ -81,10 +81,10 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${llvm_lib_exclude_f - # bcc_common_libs_for_s for shared libraries - set(bcc_common_libs_for_a b_frontend clang_frontend bpf-static - -Wl,--whole-archive ${clang_libs} ${llvm_libs} -Wl,--no-whole-archive -- ${LIBELF_LIBRARIES}) -+ ${LIBELF_LIBRARIES} ${LIBBPF_LIBRARIES}) - set(bcc_common_libs_for_s ${bcc_common_libs_for_a}) - set(bcc_common_libs_for_lua b_frontend clang_frontend bpf-static -- ${clang_libs} ${llvm_libs} ${LIBELF_LIBRARIES}) -+ ${clang_libs} ${llvm_libs} ${LIBELF_LIBRARIES} ${LIBBPF_LIBRARIES}) - - if(ENABLE_CPP_API) - add_subdirectory(api) -@@ -115,4 +115,3 @@ install(DIRECTORY libbpf/include/uapi/linux/ DESTINATION include/bcc/compat/linu - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libbcc.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - endif(ENABLE_CLANG_JIT) - install(FILES ${bcc_common_headers} DESTINATION include/bcc) --install(TARGETS bpf-shared LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) -diff --git a/src/cc/bcc_btf.cc b/src/cc/bcc_btf.cc -index 881959af..62f73f54 100644 ---- a/src/cc/bcc_btf.cc -+++ b/src/cc/bcc_btf.cc -@@ -19,8 +19,8 @@ - #include - #include "linux/btf.h" - #include "libbpf.h" --#include "libbpf/src/libbpf.h" --#include "libbpf/src/btf.h" -+#include -+#include - #include - - #define BCC_MAX_ERRNO 4095 -diff --git a/src/cc/bpf_module.cc b/src/cc/bpf_module.cc -index cf6ea8f3..1be7b788 100644 ---- a/src/cc/bpf_module.cc -+++ b/src/cc/bpf_module.cc -@@ -43,7 +43,7 @@ - #include "exported_files.h" - #include "libbpf.h" - #include "bcc_btf.h" --#include "libbpf/src/bpf.h" -+#include - - namespace ebpf { - -diff --git a/src/cc/libbpf.c b/src/cc/libbpf.c -index 9b0024dc..7b3eca4b 100644 ---- a/src/cc/libbpf.c -+++ b/src/cc/libbpf.c -@@ -51,8 +51,8 @@ - // TODO: Remove this when CentOS 6 support is not needed anymore - #include "setns.h" - --#include "libbpf/src/bpf.h" --#include "libbpf/src/libbpf.h" -+#include -+#include - - // TODO: remove these defines when linux-libc-dev exports them properly - -- cgit v1.2.3