diff options
| author | Adam Jensen <acjensen@gmail.com> | 2019-10-06 07:42:08 -0400 |
|---|---|---|
| committer | Rasmus Thomsen <oss@cogitri.dev> | 2019-10-06 14:42:46 +0200 |
| commit | ca375215304315ecdacf09322e7ed8588d66ed06 (patch) | |
| tree | d56d0cbf331d5daf0dc95bae7a460cae8f606acc | |
| parent | 7247aa072216f582045f013f1166b122be0967bd (diff) | |
| download | aports-ca375215304315ecdacf09322e7ed8588d66ed06.tar.bz2 aports-ca375215304315ecdacf09322e7ed8588d66ed06.tar.xz | |
community/libbpf: update to 0.0.5
| -rw-r--r-- | community/libbpf/20-consolidate-lib-dirs.patch | 17 | ||||
| -rw-r--r-- | community/libbpf/20-trailing-ldflags.patch | 29 | ||||
| -rw-r--r-- | community/libbpf/30-include-bits-reg.patch | 12 | ||||
| -rw-r--r-- | community/libbpf/APKBUILD | 10 |
4 files changed, 21 insertions, 47 deletions
diff --git a/community/libbpf/20-consolidate-lib-dirs.patch b/community/libbpf/20-consolidate-lib-dirs.patch new file mode 100644 index 0000000000..4e99ce3c37 --- /dev/null +++ b/community/libbpf/20-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-trailing-ldflags.patch b/community/libbpf/20-trailing-ldflags.patch deleted file mode 100644 index 7f65ef5645..0000000000 --- a/community/libbpf/20-trailing-ldflags.patch +++ /dev/null @@ -1,29 +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) -@@ -77,9 +73,9 @@ $(OBJDIR)/libbpf.so.$(VERSION): $(OBJDIR)/libbpf.so.$(LIBBPF_VERSION) - ln -sf $(^F) $@ - - $(OBJDIR)/libbpf.so.$(LIBBPF_VERSION): $(OBJS) -- $(CC) -shared $(ALL_LDFLAGS) -Wl,--version-script=$(VERSION_SCRIPT) \ -+ $(CC) -shared -Wl,--version-script=$(VERSION_SCRIPT) \ - -Wl,-soname,libbpf.so.$(VERSION) \ -- $^ -o $@ -+ $^ -o $@ $(ALL_LDFLAGS) - - $(OBJDIR)/libbpf.pc: - sed -e "s|@PREFIX@|$(PREFIX)|" \ diff --git a/community/libbpf/30-include-bits-reg.patch b/community/libbpf/30-include-bits-reg.patch deleted file mode 100644 index fc3521a160..0000000000 --- a/community/libbpf/30-include-bits-reg.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/hashmap.h b/src/hashmap.h -index 03748a7..e83055e 100644 ---- a/src/hashmap.h -+++ b/src/hashmap.h -@@ -10,4 +10,5 @@ - - #include <stdbool.h> - #include <stddef.h> -+#include <bits/reg.h> - #include "libbpf_internal.h" - - static inline size_t hash_bits(size_t h, int bits) diff --git a/community/libbpf/APKBUILD b/community/libbpf/APKBUILD index dad48f3f2a..347b79cc0b 100644 --- a/community/libbpf/APKBUILD +++ b/community/libbpf/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Adam Jensen <acjensen@gmail.com> pkgname=libbpf -pkgver=0.0.4 +pkgver=0.0.5 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" @@ -13,8 +13,7 @@ makedepends="build-base linux-headers elfutils-dev" subpackages="$pkgname-dev" source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz 10-include-stddef.patch - 20-trailing-ldflags.patch - 30-include-bits-reg.patch" + 20-consolidate-lib-dirs.patch" build() { cd src @@ -27,7 +26,6 @@ package() { cp -R "$builddir/include/uapi" "$pkgdir/usr/include/uapi" } -sha512sums="1e4a16ed0f3e378aa9d7080e4b54cb3a9542975105b09977d1ddecf3ae4dabb3b5edf80b92b61644b1f0cbda7ee7e135ee0f736e71c1d201a97b1b3dd573b543 libbpf-0.0.4.tar.gz +sha512sums="e42f6cc8f834f2d3cf9138d655bd3727ffffb2693850f7f6409ec4d536336bc5fa479a64eefc802a5915e333677eca843f8f1bd0132589bba10bdc89064eee0c libbpf-0.0.5.tar.gz 946e445ffa4c5df42ebac77b7a1c6478b37dc7b55e0883aee195c6a8c4f8718b4dbf98b7c6d3016e1619e59440d8e4a76dad1e843114dfe2f9a2610e5cbb7943 10-include-stddef.patch -1ec15c45fc085b44aa1f6d5626f0ba9e57280304d1f6e1c4e7fe8e2b81fc927f5500fd48f8e70d2affb91dd67a74a80c85698d39bb85febde5abd479df5cdccc 20-trailing-ldflags.patch -27cfd7799bad695e5a1b949cfa12fd37f13d01256f4cc19a990a7c8cc2786d429f7ec6d99c6eea1ab48590662b6769f9d814fcb343de61f3e222a7a68a751876 30-include-bits-reg.patch" +26f2b7bee6a11f2c9d4a36b5ee3cd2e85d65f496f0ce9ca49e561f2783ab95b56e23692d5de2364125bbdedd0d5978e884519e7d48131a06077d5578a4504b4a 20-consolidate-lib-dirs.patch" |