From 1d831526409c446fc1fa84d9ac85897ac2fcc73ce33f44c6e2ad9215d893aa8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Rostecki?= Date: Fri, 20 Aug 2021 09:33:03 +0000 Subject: [PATCH] Accepting request 913283 from home:michals - Depend on new enough Linux headers. OBS-URL: https://build.opensuse.org/request/show/913283 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libbpf?expand=0&rev=9 --- libbpf.changes | 5 +++++ libbpf.spec | 1 + libdir.patch | 5 ++++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/libbpf.changes b/libbpf.changes index e80082b..46eac13 100644 --- a/libbpf.changes +++ b/libbpf.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Aug 20 08:47:47 UTC 2021 - Michal Suchanek + +- Depend on new enough Linux headers. + ------------------------------------------------------------------- Mon Aug 2 11:00:28 UTC 2021 - Callum Farmer diff --git a/libbpf.spec b/libbpf.spec index 7a23352..94aa70b 100644 --- a/libbpf.spec +++ b/libbpf.spec @@ -29,6 +29,7 @@ Source99: baselibs.conf # PATCH-FIX-UPSTREAM https://github.com/libbpf/libbpf/issues/337 Patch: libdir.patch BuildRequires: libelf-devel +BuildRequires: linux-glibc-devel >= 4.5 BuildRequires: python3 BuildRequires: zlib-devel diff --git a/libdir.patch b/libdir.patch index 2cf0dd1..bbcafb3 100644 --- a/libdir.patch +++ b/libdir.patch @@ -1,8 +1,11 @@ -From 60ab75597d2735e8f7bf91e4423feab87568d1e7 Mon Sep 17 00:00:00 2001 +From 6eb5e25905d2258c595d7fc75624c60a357c1c3b Mon Sep 17 00:00:00 2001 From: Michal Suchanek Date: Sun, 18 Jul 2021 22:05:01 +0200 Subject: [PATCH] Makefile: Default LIBSUBDIR to lib64 on 64bit architectures. +Upstream: merged (expected v0.5.0) +Git-commit: 6eb5e25905d2258c595d7fc75624c60a357c1c3b + commit a82a66e ("Extend build and add install rules to Makefile") adds special handling for LIBSUBDIR on x86_64. Expand this to all architectures with 64 in name which suggests a 32bit variant exists, and