From 7b6d965692a63e310719083fa4fa7c31c73f5ff5a4861abace1625de0fc4f49a Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 23 Feb 2023 08:45:42 +0000 Subject: [PATCH] Accepting request 1067103 from home:marxin:branches:Base:System - Rebase binutils-2.40.patch for v6.2. OBS-URL: https://build.opensuse.org/request/show/1067103 OBS-URL: https://build.opensuse.org/package/show/Base:System/bpftool?expand=0&rev=12 --- binutils-2.40.patch | 20 ++++++++++---------- bpftool.changes | 5 +++++ 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/binutils-2.40.patch b/binutils-2.40.patch index 9cfdf5c..dc0ce8e 100644 --- a/binutils-2.40.patch +++ b/binutils-2.40.patch @@ -1,13 +1,13 @@ diff --git a/tools/bpf/bpftool/Makefile b/tools/bpf/bpftool/Makefile -index 4a95c017ad4c..9a4851df3276 100644 +index f610e184ce02..afef9c65614e 100644 --- a/tools/bpf/bpftool/Makefile +++ b/tools/bpf/bpftool/Makefile -@@ -139,6 +139,8 @@ SRCS = $(filter-out $(BFD_SRCS),$(wildcard *.c)) - - ifeq ($(feature-libbfd),1) - LIBS += -lbfd -ldl -lopcodes -+else ifeq ($(feature-libbfd-liberty-sframe),1) -+ LIBS += -lbfd -ldl -lopcodes -liberty -lsframe - else ifeq ($(feature-libbfd-liberty),1) - LIBS += -lbfd -ldl -lopcodes -liberty - else ifeq ($(feature-libbfd-liberty-z),1) +@@ -154,6 +154,8 @@ else + # Fall back on libbfd + ifeq ($(feature-libbfd),1) + LIBS += -lbfd -ldl -lopcodes ++ else ifeq ($(feature-libbfd-liberty-sframe),1) ++ LIBS += -lbfd -ldl -lopcodes -liberty -lsframe + else ifeq ($(feature-libbfd-liberty),1) + LIBS += -lbfd -ldl -lopcodes -liberty + else ifeq ($(feature-libbfd-liberty-z),1) diff --git a/bpftool.changes b/bpftool.changes index 2c5dc40..45b4327 100644 --- a/bpftool.changes +++ b/bpftool.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 22 08:21:22 UTC 2023 - Martin Liška + +- Rebase binutils-2.40.patch for v6.2. + ------------------------------------------------------------------- Wed Feb 15 09:11:12 UTC 2023 - Martin Liška