From fbabe58c6c5084e5e89df40205c78838964da500 Mon Sep 17 00:00:00 2001
From: Adam Jensen <acjensen@gmail.com>
Date: Tue, 21 Apr 2020 07:17:00 -0400
Subject: community/libbpf: upgrade to 0.0.8

---
 community/libbpf/10-consolidate-lib-dirs.patch | 17 +++++++++++++++++
 community/libbpf/20-consolidate-lib-dirs.patch | 17 -----------------
 community/libbpf/APKBUILD                      | 10 +++++-----
 3 files changed, 22 insertions(+), 22 deletions(-)
 create mode 100644 community/libbpf/10-consolidate-lib-dirs.patch
 delete mode 100644 community/libbpf/20-consolidate-lib-dirs.patch

diff --git a/community/libbpf/10-consolidate-lib-dirs.patch b/community/libbpf/10-consolidate-lib-dirs.patch
new file mode 100644
index 0000000000..4e99ce3c37
--- /dev/null
+++ b/community/libbpf/10-consolidate-lib-dirs.patch
@@ -0,0 +1,17 @@
+diff --git a/src/Makefile b/src/Makefile
+index e9021fe..1d86ecd 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -54,11 +54,7 @@ INSTALL = install
+ 
+ DESTDIR ?=
+ 
+-ifeq ($(shell uname -m),x86_64)
+-	LIBSUBDIR := lib64
+-else
+-	LIBSUBDIR := lib
+-endif
++LIBSUBDIR := lib
+ 
+ PREFIX ?= /usr
+ LIBDIR ?= $(PREFIX)/$(LIBSUBDIR)
diff --git a/community/libbpf/20-consolidate-lib-dirs.patch b/community/libbpf/20-consolidate-lib-dirs.patch
deleted file mode 100644
index 4e99ce3c37..0000000000
--- a/community/libbpf/20-consolidate-lib-dirs.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/Makefile b/src/Makefile
-index e9021fe..1d86ecd 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -54,11 +54,7 @@ INSTALL = install
- 
- DESTDIR ?=
- 
--ifeq ($(shell uname -m),x86_64)
--	LIBSUBDIR := lib64
--else
--	LIBSUBDIR := lib
--endif
-+LIBSUBDIR := lib
- 
- PREFIX ?= /usr
- LIBDIR ?= $(PREFIX)/$(LIBSUBDIR)
diff --git a/community/libbpf/APKBUILD b/community/libbpf/APKBUILD
index b6a5e39364..6f3a65710c 100644
--- a/community/libbpf/APKBUILD
+++ b/community/libbpf/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Adam Jensen <acjensen@gmail.com>
 pkgname=libbpf
-pkgver=0.0.7
-pkgrel=1
+pkgver=0.0.8
+pkgrel=0
 pkgdesc="A library for interacting with the Linux kernel's Berkeley Packet Filter (BPF) facility from user space"
 url="https://github.com/libbpf/libbpf"
 arch="all"
@@ -12,7 +12,7 @@ depends="elfutils"
 makedepends="build-base linux-headers elfutils-dev zlib-dev"
 subpackages="$pkgname-dev"
 source="$pkgname-$pkgver.tar.gz::https://github.com/libbpf/libbpf/archive/v$pkgver.tar.gz
-	20-consolidate-lib-dirs.patch"
+	10-consolidate-lib-dirs.patch"
 
 build() {
 	cd src
@@ -25,5 +25,5 @@ package() {
 	cp -R "$builddir/include/uapi" "$pkgdir/usr/include/uapi"
 }
 
-sha512sums="c2cbc869b7e11339deab3152a6e2d0b3bba25da513d18d77fb0a698cbe61d6bd48175a58e7dd7a3695fbf27faf48b4f517ac5d3a3c66c086df2e5d1b73a2595d  libbpf-0.0.7.tar.gz
-26f2b7bee6a11f2c9d4a36b5ee3cd2e85d65f496f0ce9ca49e561f2783ab95b56e23692d5de2364125bbdedd0d5978e884519e7d48131a06077d5578a4504b4a  20-consolidate-lib-dirs.patch"
+sha512sums="1074fb52b7a158e4e2713c4c7083528ccf2d99b899853078f230234ba112071bfa66e174d8800d36516e26d5bf06da44d100a5b2f866d267f62c9308f431220c  libbpf-0.0.8.tar.gz
+26f2b7bee6a11f2c9d4a36b5ee3cd2e85d65f496f0ce9ca49e561f2783ab95b56e23692d5de2364125bbdedd0d5978e884519e7d48131a06077d5578a4504b4a  10-consolidate-lib-dirs.patch"
-- 
cgit v1.2.3