bpftools: fix build (#380729)

This commit is contained in:
K900
2025-02-10 07:53:51 +03:00
committed by GitHub
2 changed files with 0 additions and 37 deletions
@@ -1,13 +0,0 @@
diff --git a/tools/include/uapi/linux/types.h b/tools/include/uapi/linux/types.h
index 91fa51a9c31d..bfbd9b47277f 100644
--- a/tools/include/uapi/linux/types.h
+++ b/tools/include/uapi/linux/types.h
@@ -2,7 +2,7 @@
#ifndef _UAPI_LINUX_TYPES_H
#define _UAPI_LINUX_TYPES_H
-#include <asm-generic/int-ll64.h>
+#include <asm/types.h>
/* copied from linux:include/uapi/linux/types.h */
#define __bitwise
-24
View File
@@ -23,30 +23,6 @@ stdenv.mkDerivation rec {
separateDebugInfo = true;
patches = [
# fix unknown type name '__vector128' on ppc64le
./include-asm-types-for-ppc64le.patch
# fix build for riscv64
(fetchpatch {
# libbpf: Add missing per-arch include path
# https://patchwork.kernel.org/project/linux-riscv/patch/20240927131355.350918-1-bjorn@kernel.org/
url = "https://patchwork.kernel.org/project/linux-riscv/patch/20240927131355.350918-1-bjorn@kernel.org/raw/";
hash = "sha256-edXY/ejHW5L7rGgY5B2GmVZxUgnLdBadNhBOSAgcL7M=";
})
(fetchpatch {
# selftests: bpf: Add missing per-arch include path
# https://patchwork.kernel.org/project/linux-riscv/patch/20240927131355.350918-2-bjorn@kernel.org/
url = "https://patchwork.kernel.org/project/linux-riscv/patch/20240927131355.350918-2-bjorn@kernel.org/raw/";
hash = "sha256-7yNWE/L/qd3vcLtJYoSyGxB3ytySlr20R0D3t5ni2Fc=";
})
(fetchpatch {
# tools: Override makefile ARCH variable if defined, but empty
# https://patchwork.kernel.org/project/linux-riscv/patch/20241127101748.165693-1-bjorn@kernel.org/
url = "https://patchwork.kernel.org/project/linux-riscv/patch/20241127101748.165693-1-bjorn@kernel.org/raw/";
hash = "sha256-y8N71Hm1XfX9g3S6PzW2m7Lxp6wQQMfQE9L0QNt8cYY=";
})
];
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [
python3