From c9d6f0e1c8a99eec548b1690e1bb58d90189a44d Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 9 Jan 2023 15:03:29 -0700 Subject: [PATCH] package/libbpf: bump to version 1.1.0 Drop patch which is now upstream. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- ...cross-compilation-for-32-bit-targets.patch | 38 ------------------- package/libbpf/libbpf.hash | 2 +- package/libbpf/libbpf.mk | 2 +- 3 files changed, 2 insertions(+), 40 deletions(-) delete mode 100644 package/libbpf/0001-Makefile-Fix-cross-compilation-for-32-bit-targets.patch diff --git a/package/libbpf/0001-Makefile-Fix-cross-compilation-for-32-bit-targets.patch b/package/libbpf/0001-Makefile-Fix-cross-compilation-for-32-bit-targets.patch deleted file mode 100644 index 12c22f3147..0000000000 --- a/package/libbpf/0001-Makefile-Fix-cross-compilation-for-32-bit-targets.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 68e6f83f223ebf3fbf0d94c0f4592e5e6773f0c1 Mon Sep 17 00:00:00 2001 -From: Tobias Waldekranz -Date: Fri, 14 Oct 2022 21:14:14 +0200 -Subject: [PATCH] Makefile: Fix cross-compilation for 32-bit targets - -Determining the correct library installation path (lib vs. lib64) -using uname(1) breaks in cross compilation scenarios where word widths -differ between the host and target system. - -Instead, source the information from the compilers '-dumpmachine' -option (supported by both GCC and Clang). - -We call this the "host" architecture, using the same nomenclature as -Autotools (--host configure option). - -Upstream: https://github.com/libbpf/libbpf/commit/68e6f83f223ebf3fbf0d94c0f4592e5e6773f0c1 -Signed-off-by: Tobias Waldekranz ---- - src/Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/Makefile b/src/Makefile -index 3cd0854..d535f81 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -77,7 +77,8 @@ INSTALL = install - - DESTDIR ?= - --ifeq ($(filter-out %64 %64be %64eb %64le %64el s390x, $(shell uname -m)),) -+HOSTARCH = $(firstword $(subst -, ,$(shell $(CC) -dumpmachine))) -+ifeq ($(filter-out %64 %64be %64eb %64le %64el s390x, $(HOSTARCH)),) - LIBSUBDIR := lib64 - else - LIBSUBDIR := lib --- -2.34.1 - diff --git a/package/libbpf/libbpf.hash b/package/libbpf/libbpf.hash index 4305872d9f..75f2b1695c 100644 --- a/package/libbpf/libbpf.hash +++ b/package/libbpf/libbpf.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 3d6afde67682c909e341bf194678a8969f17628705af25f900d5f68bd299cb03 libbpf-1.0.1.tar.gz +sha256 5da826c968fdb8a2f714701cfef7a4b7078be030cf58b56143b245816301cbb8 libbpf-1.1.0.tar.gz sha256 847f4addbd56e2d5be20c4ea0845e972672fc07b755fadaae5f7abd35d71e349 LICENSE sha256 e1638b9a0c68ca90fad3df1d6b4e430804d2fbdc15e58d02cffddfae38953bbf LICENSE.BSD-2-Clause sha256 0b9a4febcdee6de55872501d5c1a8f5d8b0d1650cd4d5351995ceb22e889f8ca LICENSE.LGPL-2.1 diff --git a/package/libbpf/libbpf.mk b/package/libbpf/libbpf.mk index 820f1dc4bf..b498136ace 100644 --- a/package/libbpf/libbpf.mk +++ b/package/libbpf/libbpf.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBPF_VERSION = 1.0.1 +LIBBPF_VERSION = 1.1.0 LIBBPF_SITE = $(call github,libbpf,libbpf,v$(LIBBPF_VERSION)) LIBBPF_LICENSE = GPL-2.0, LGPL-2.1, BSD-2-Clause LIBBPF_LICENSE_FILES = LICENSE LICENSE.BSD-2-Clause LICENSE.LGPL-2.1