diff options
| -rw-r--r-- | .SRCINFO | 45 | ||||
| -rw-r--r-- | PKGBUILD | 96 |
2 files changed, 70 insertions, 71 deletions
@@ -1,6 +1,6 @@ pkgbase = bcc-git pkgdesc = BPF Compiler Collection - latest git code - pkgver = v0.5.0.r305.7c27c271 + pkgver = 0.11.0.dev0+r1564.g3d21000a pkgrel = 1 url = https://github.com/iovisor/bcc arch = x86_64 @@ -8,31 +8,39 @@ pkgbase = bcc-git checkdepends = netperf checkdepends = iperf makedepends = cmake - makedepends = clang>=3.7.0 - makedepends = llvm>=3.7.0 + makedepends = clang + makedepends = llvm makedepends = flex makedepends = bison makedepends = python - makedepends = python2 - conflicts = bcc + makedepends = git source = bcc-git::git+https://github.com/iovisor/bcc sha256sums = SKIP pkgname = bcc-git pkgdesc = BPF Compiler Collection - C library and examples - latest git code - depends = linux-headers - optdepends = bcc-tools-git: Python utilites using the BCC library - optdepends = python-bcc-git: Python 3 bindings for BCC - optdepends = python2-bcc-git: Python 2 bindings for BCC - provides = bcc-git - provides = libbcc-git + depends = clang + depends = libelf + optdepends = linux-headers: build modules against the Arch kernel + optdepends = linux-lts-headers: build modules against the LTS kernel + optdepends = linux-zen-headers: build modules against the ZEN kernel + optdepends = linux-hardened-headers: build modules against the HARDENED kernel + optdepends = bcc-tools: Python utilites using the BCC library + optdepends = python-bcc: Python 3 bindings for BCC + provides = bcc=0.11.0.dev0+r1564.g3d21000a + provides = libbcc=0.11.0.dev0+r1564.g3d21000a + conflicts = bcc + conflicts = libbcc pkgname = bcc-tools-git pkgdesc = BPF Compiler Collection - Tools - latest git code arch = any depends = bcc-git - optdepends = python-bcc-git: Python 3 bindings for BCC - optdepends = python2-bcc-git: Python 2 bindings for BCC + depends = libedit + depends = ethtool + optdepends = python-bcc-git: Python bindings for BCC + optdepends = luajit: Lua bindings for BCC + provides = bcc-tools=0.11.0.dev0+r1564.g3d21000a conflicts = bcc-tools pkgname = python-bcc-git @@ -40,10 +48,7 @@ pkgname = python-bcc-git arch = any depends = bcc-git depends = python - -pkgname = python2-bcc-git - pkgdesc = BPF Compiler Collection - Python 2 bindings - latest git code - arch = any - depends = bcc-git - depends = python2 - + optdepends = python-netaddr: Network address representation and manipulation + optdepends = python-pyroute2: Netlink and Linux network configuration + provides = python-bcc=0.11.0.dev0+r1564.g3d21000a + conflicts = python-bcc @@ -1,47 +1,59 @@ -# Maintainer: Omar Sandoval <osandov@osandov.com> +# Maintainer: Gordian Edenhofer <gordian.edenhofer@gmail.com> +# Contributor: Omar Sandoval <osandov@osandov.com> # Contributor: Troy Engel <troyengel+arch@gmail.com> # Contributor: Manuel Mendez <mmendez534@gmail.com> pkgbase=bcc-git -pkgname=('bcc-git' 'bcc-tools-git' 'python-bcc-git' 'python2-bcc-git') -pkgver=v0.5.0.r305.7c27c271 +pkgname=('bcc-git' 'bcc-tools-git' 'python-bcc-git') +pkgver=0.11.0.dev0+r1564.g3d21000a pkgrel=1 pkgdesc='BPF Compiler Collection - latest git code' arch=('x86_64') url='https://github.com/iovisor/bcc' license=('Apache') -conflicts=('bcc') -makedepends=('cmake' 'clang>=3.7.0' 'llvm>=3.7.0' 'flex' 'bison' 'python' 'python2') +makedepends=('cmake' 'clang' 'llvm' 'flex' 'bison' 'python' 'git') checkdepends=('netperf' 'iperf') source=('bcc-git::git+https://github.com/iovisor/bcc') sha256sums=('SKIP') pkgver() { - cd "${srcdir}/${pkgbase}" - printf "%s" "$(git describe --long | sed 's/\([^-]*-\)g/r\1/;s/-/./g')" + cd "${srcdir}/${pkgname}" + ( set -o pipefail + git describe --long 2>/dev/null | sed 's/^v//;s/\([^-]*-g\)/dev0+r\1/;s/-/./g' \ + || printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + ) } build() { - cd "${srcdir}/${pkgbase}" - rm -rf build - mkdir build - cd build + cd "${srcdir}/${pkgname}" + + rm -rf build/ + mkdir -p build/ + cd build/ + + export CFLAGS+=" -ffat-lto-objects" + export CXXFLAGS+=" -ffat-lto-objects" # The python version is irrelevant at this stage - cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=/usr/lib .. + cmake -DREVISION=$pkgver \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib .. \ + -DENABLE_LLVM_SHARED=1 # FS#71163 make } package_bcc-git() { pkgdesc='BPF Compiler Collection - C library and examples - latest git code' - depends=('linux-headers') - optdepends=('bcc-tools-git: Python utilites using the BCC library' - 'python-bcc-git: Python 3 bindings for BCC' - 'python2-bcc-git: Python 2 bindings for BCC') - makedepends=('cmake' 'clang>=3.7.0' 'llvm>=3.7.0' 'flex' 'bison') - provides=('bcc-git' 'libbcc-git') + depends=('clang' 'libelf') + optdepends=('linux-headers: build modules against the Arch kernel' + 'linux-lts-headers: build modules against the LTS kernel' + 'linux-zen-headers: build modules against the ZEN kernel' + 'linux-hardened-headers: build modules against the HARDENED kernel' + 'bcc-tools: Python utilites using the BCC library' + 'python-bcc: Python 3 bindings for BCC') + provides=("bcc=${pkgver}" "libbcc=${pkgver}") + conflicts=('bcc' 'libbcc') cd "${srcdir}/${pkgbase}/build" @@ -50,7 +62,6 @@ package_bcc-git() { # These go in a split package python*-bcc-git rm -rf "${pkgdir}"/usr/lib/python* - # These go in a split package bcc-tools-git rm -rf "${pkgdir}"/usr/share/bcc/{tools,man} } @@ -58,53 +69,36 @@ package_bcc-git() { package_bcc-tools-git() { pkgdesc='BPF Compiler Collection - Tools - latest git code' arch=('any') - depends=('bcc-git') + depends=('bcc-git' 'libedit' 'ethtool') + optdepends=('python-bcc-git: Python bindings for BCC' + 'luajit: Lua bindings for BCC') + provides=("bcc-tools=${pkgver}") conflicts=('bcc-tools') - optdepends=('python-bcc-git: Python 3 bindings for BCC' - 'python2-bcc-git: Python 2 bindings for BCC') - cd "${srcdir}/${pkgbase}/build/tools" - make DESTDIR="${pkgdir}" install + cd "${srcdir}/${pkgbase}/build" - cd "${srcdir}/${pkgbase}/build/man" - make DESTDIR="${pkgdir}" install + make -C tools/ DESTDIR="${pkgdir}" install + make -C man/ DESTDIR="${pkgdir}" install } package_python-bcc-git() { pkgdesc='BPF Compiler Collection - Python 3 bindings - latest git code' arch=('any') depends=('bcc-git' 'python') - makedepends=('cmake') + optdepends=('python-netaddr: Network address representation and manipulation' + 'python-pyroute2: Netlink and Linux network configuration') + provides=("python-bcc=${pkgver}") + conflicts=('python-bcc') cd "${srcdir}/${pkgbase}/build" - # Force a quick python3 binding build (C library is already buidl) + # Force a quick python3 binding build (C library is already built) cmake -DREVISION="${pkgver}" \ -DPYTHON_CMD="python" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=/usr/lib .. - - make - - # Install just those bindings - make -C "${srcdir}/${pkgbase}/build/src/python" DESTDIR="${pkgdir}" install -} - -package_python2-bcc-git() { - pkgdesc='BPF Compiler Collection - Python 2 bindings - latest git code' - arch=('any') - depends=('bcc-git' 'python2') - makedepends=('cmake') - - cd "${srcdir}/${pkgbase}/build" - - # Force a quick python2 binding build (C library is already buidl) - cmake -DPYTHON_CMD="python2" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=/usr/lib .. - - make + make -C src/python # Install just those bindings - make -C "${srcdir}/${pkgbase}/build/src/python" DESTDIR="${pkgdir}" install + make -C src/python DESTDIR="${pkgdir}" install } |