From 5b07c37dfa4625ad0256bf7a4f8386abe72a694b Mon Sep 17 00:00:00 2001 From: Tony Ambardar Date: Wed, 3 Apr 2024 15:31:29 -0700 Subject: [PATCH] libbpf: Update to v1.4.0 Update to the latest upstream release to include recent improvements and bugfixes, and update copyright. Remove MAKE_VARS usage in Makefile and drop 001-cflags.patch which are no longer needed. Also add flags to disable LTO, mistakenly dropped earlier. Link: https://github.com/libbpf/libbpf/releases/tag/v1.4.0 Signed-off-by: Tony Ambardar --- package/libs/libbpf/Makefile | 14 +++++--------- package/libs/libbpf/patches/001-cflags.patch | 10 ---------- 2 files changed, 5 insertions(+), 19 deletions(-) delete mode 100644 package/libs/libbpf/patches/001-cflags.patch diff --git a/package/libs/libbpf/Makefile b/package/libs/libbpf/Makefile index 913c025e54..666786e9f6 100644 --- a/package/libs/libbpf/Makefile +++ b/package/libs/libbpf/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2020-2023 Tony Ambardar +# Copyright (C) 2020-2024 Tony Ambardar # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,19 +8,19 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libbpf -PKG_VERSION:=1.3.0 +PKG_VERSION:=1.4.0 PKG_RELEASE:=1 PKG_SOURCE_URL:=https://github.com/libbpf/libbpf -PKG_MIRROR_HASH:=669d8db696f86f640f86edc358bffa2af8dda656b8e787b095de3578bd8d94ff +PKG_MIRROR_HASH:=4c37636699c604de345937bdbdf8f2e6ce69cbf768a4aa669c32b542e5302de6 PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=v1.3.0 +PKG_SOURCE_VERSION:=v1.4.0 PKG_ABI_VERSION:=$(firstword $(subst .,$(space),$(PKG_VERSION))) PKG_MAINTAINER:=Tony Ambardar PKG_CPE_ID:=cpe:/a:libbpf_project:libbpf -PKG_BUILD_FLAGS:=no-mips16 +PKG_BUILD_FLAGS:=no-mips16 no-gc-sections no-lto PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 @@ -41,10 +41,6 @@ define Package/libbpf/description libbpf is a library for loading eBPF programs and reading and manipulating eBPF objects from user-space. endef -MAKE_VARS = \ - EXTRA_CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" - MAKE_FLAGS += \ $(if $(findstring c,$(OPENWRT_VERBOSE)),V=1,V='') \ LIBSUBDIR=lib diff --git a/package/libs/libbpf/patches/001-cflags.patch b/package/libs/libbpf/patches/001-cflags.patch deleted file mode 100644 index 4c0e93a75b..0000000000 --- a/package/libs/libbpf/patches/001-cflags.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/Makefile -+++ b/src/Makefile -@@ -34,6 +34,7 @@ ALL_CFLAGS := $(INCLUDES) - - SHARED_CFLAGS += -fPIC -fvisibility=hidden -DSHARED - -+CFLAGS = $(EXTRA_CFLAGS) - CFLAGS ?= -g -O2 -Werror -Wall -std=gnu89 - ALL_CFLAGS += $(CFLAGS) \ - -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \ -- 2.30.2