pahole: update to 1.15.

This commit is contained in:
Andrew Benson 2019-07-05 17:44:00 -05:00 committed by Juan RP
parent bff6b6640e
commit f43d761d43
2 changed files with 24 additions and 3 deletions

View file

@ -11,3 +11,16 @@
#define roundup(x,y) ((((x) + ((y) - 1)) / (y)) * (y)) #define roundup(x,y) ((((x) + ((y) - 1)) / (y)) * (y))
static inline __attribute__((const)) bool is_power_of_2(unsigned long n) static inline __attribute__((const)) bool is_power_of_2(unsigned long n)
--- lib/bpf/src/libbpf.c.orig
+++ lib/bpf/src/libbpf.c
@@ -10,6 +10,10 @@
* Copyright (C) 2019 Isovalent, Inc.
*/
+#ifndef __always_inline
+#define __always_inline inline
+#endif
+
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
#endif

View file

@ -1,7 +1,8 @@
# Template file for 'pahole' # Template file for 'pahole'
pkgname=pahole pkgname=pahole
version=1.12 version=1.15
revision=1 revision=1
_bpfver=0.0.3
build_style=cmake build_style=cmake
configure_args="-D__LIB=lib" configure_args="-D__LIB=lib"
makedepends="elfutils-devel zlib-devel" makedepends="elfutils-devel zlib-devel"
@ -9,13 +10,20 @@ short_desc="Various DWARF utils"
maintainer="Andrew Benson <abenson+void@gmail.com>" maintainer="Andrew Benson <abenson+void@gmail.com>"
license="GPL-2.0-only" license="GPL-2.0-only"
homepage="http://git.kernel.org/?p=devel/pahole/pahole.git;a=summary" homepage="http://git.kernel.org/?p=devel/pahole/pahole.git;a=summary"
distfiles="https://git.kernel.org/pub/scm/devel/pahole/pahole.git/snapshot/pahole-${version}.tar.gz" distfiles="https://git.kernel.org/pub/scm/devel/pahole/pahole.git/snapshot/pahole-${version}.tar.gz
checksum=2452464cbfdbaece6187d7860000fe8ef24b7271f88122cf540d3e0ab4a644d1 https://github.com/libbpf/libbpf/archive/v${_bpfver}.tar.gz"
checksum="a84e183a0ef652e4198a161a20d9eeb45d3c153f5208e1cea833e1f28ae6207d
972da73f4774be062a112fc0c9ebb5d238b775ed4512df5ce2cf20c8333929d3"
case $XBPS_TARGET_MACHINE in case $XBPS_TARGET_MACHINE in
*-musl) makedepends+=" musl-obstack argp-standalone" *-musl) makedepends+=" musl-obstack argp-standalone"
esac esac
pre_patch() {
rm -rf lib/bpf
mv "../libbpf-${_bpfver}/" "lib/bpf"
}
pre_configure() { pre_configure() {
case $XBPS_TARGET_MACHINE in case $XBPS_TARGET_MACHINE in
*-musl) sed -i CMakeLists.txt -e "/^target_link_libraries/s/)/ obstack argp)/" *-musl) sed -i CMakeLists.txt -e "/^target_link_libraries/s/)/ obstack argp)/"