From fdee03647f9ada725d739e3980d092c6f12d9d3b Mon Sep 17 00:00:00 2001 From: Francis Laniel Date: Fri, 22 Apr 2022 19:16:12 +0100 Subject: [PATCH] package/pahole: bump to commit 73383b3a39af The main goal is to use buildroot host-libbpf instead of pahole libbpf git submodule (which ends up being the same thing anyway). However, this creates compilation errors due to the use of deprecated APIs (like btf__get_nr_types). Bump pahole to a commit that is compatible with current libbpf: 73383b3a39af ("libbpf: Update libbpf to the latest git HEAD") Signed-off-by: Francis Laniel Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pahole/pahole.hash | 2 +- package/pahole/pahole.mk | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/pahole/pahole.hash b/package/pahole/pahole.hash index 420db15e75..8e5560b5e7 100644 --- a/package/pahole/pahole.hash +++ b/package/pahole/pahole.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 cde85af68b368f50a913be387f94f6b43612a04af6c92387b4dcabb712a668fe pahole-v1.23-br1.tar.gz +sha256 3531396c0568793ef8ca1a2fbb44ef2e1e81bdd55496a4487b83ba4d95df9d99 pahole-73383b3a39afe86b22e098773e47b8546c48a649.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/pahole/pahole.mk b/package/pahole/pahole.mk index da6d67e6a2..199fa8cc11 100644 --- a/package/pahole/pahole.mk +++ b/package/pahole/pahole.mk @@ -4,14 +4,14 @@ # ################################################################################ -PAHOLE_VERSION = v1.23 -PAHOLE_SITE = https://git.kernel.org/pub/scm/devel/pahole/pahole.git -PAHOLE_SITE_METHOD = git -# pahole contains git submodule and relies on them to be built. -PAHOLE_GIT_SUBMODULES = YES -HOST_PAHOLE_DEPENDENCIES = host-elfutils +PAHOLE_VERSION = 73383b3a39afe86b22e098773e47b8546c48a649 +PAHOLE_SITE = https://git.kernel.org/pub/scm/devel/pahole/pahole.git/snapshot +HOST_PAHOLE_DEPENDENCIES = \ + host-elfutils \ + host-libbpf # Defining __LIB is needed to build pahole. -HOST_PAHOLE_CONF_OPTS = -D__LIB=lib +# Set LIBBPF_EMBEDDED to OFF to use host-libbpf. +HOST_PAHOLE_CONF_OPTS = -D__LIB=lib -DLIBBPF_EMBEDDED=OFF PAHOLE_LICENSE = GPL-2.0 PAHOLE_LICENSE_FILES = COPYING