helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-05-18 23:53:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

pahole: don't download vendored libbpf

Browse Source 
Just use the system libbpf.

Signed-off-by: Matteo Croce <mcroce@microsoft.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Matteo Croce 2021-09-22 02:03:55 +02:00 committed by Khem Raj
parent ae1705aad5
commit 5a31083b61
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
meta-oe/recipes-devtools/pahole/files/0003-CMakeList.txt-don-t-download-libbpf-source-when-syst.patch Normal file
View File

@ -0,0 +1,34 @@
From 3d20210d84f61ee2189927e2d9de9ce3e5a0a9c5 Mon Sep 17 00:00:00 2001
From: Matteo Croce <mcroce@microsoft.com>
Date: Mon, 20 Sep 2021 18:44:52 +0200
Subject: [PATCH] CMakeList.txt: Don't download libbpf source when system
library is used
Upstream-Status: Backport [https://git.kernel.org/pub/scm/devel/pahole/pahole.git/commit/?id=3d20210d84f61ee2189927e2d9de9ce3e5a0a9c5]
The build system always download the libbpf submodule, regardless if
we're using the embedded or the system version.
Download the libbpf source only if we're using the embedded one.
Signed-off-by: Matteo Croce <mcroce@microsoft.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8523bce..2ab66e4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,7 +65,7 @@ find_package(Python3 QUIET)
# make sure git submodule(s) are checked out
find_package(Git QUIET)
-if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
+if(LIBBPF_EMBEDDED AND GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
# Update submodules as needed
option(GIT_SUBMODULE "Check submodules during build" ON)
if(GIT_SUBMODULE)
--
2.31.1

3
meta-oe/recipes-devtools/pahole/pahole_1.22.bb
View File

@ -10,7 +10,8 @@ COMPATIBLE_HOST = "(x86_64|i.86|aarch64).*-linux"
SRCREV = "f02af2553ea58ae1186226af0d0ec835a248358f"
SRC_URI = "git://git.kernel.org/pub/scm/devel/pahole/pahole.git \
file://0001-CMakeList.txt-make-python-optional.patch \
file://0002-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch"
file://0002-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch \
file://0003-CMakeList.txt-don-t-download-libbpf-source-when-syst.patch"
S = "${WORKDIR}/git"