From d1f55cf594f1f1228a4b44c097fc5d9f2e655f0c Mon Sep 17 00:00:00 2001
From: psykose <alice@ayaya.dev>
Date: Sat, 30 Jul 2022 04:29:33 +0000
Subject: [PATCH] testing/dpdk: remove execinfo support

(and rename test, as it conflicts with some stuff when sourced)

see:
https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/36722
https://www.openwall.com/lists/musl/2021/07/16/1
https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/22958
---
 testing/dpdk/APKBUILD          | 13 ++++++++-----
 testing/dpdk/no-execinfo.patch | 12 ++++++++++++
 2 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 testing/dpdk/no-execinfo.patch

diff --git a/testing/dpdk/APKBUILD b/testing/dpdk/APKBUILD
index 181f35ddc9c..d0c7a5da20c 100644
--- a/testing/dpdk/APKBUILD
+++ b/testing/dpdk/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Duncan Bellamy <dunk@denkimushi.com>
 pkgname=dpdk
 pkgver=22.07
-pkgrel=0
+pkgrel=1
 pkgdesc="Data Plane Development Kit"
 url="https://dpdk.org/"
 # s390x, riscv64 is not supported
@@ -18,7 +18,6 @@ makedepends="
 	meson
 	jansson
 	libbsd-dev
-	libexecinfo-dev
 	libpcap-dev
 	linux-headers
 	numactl
@@ -26,8 +25,10 @@ makedepends="
 	py3-sphinx
 	zlib-dev
 	"
-subpackages="$pkgname-test $pkgname-examples $pkgname-static $pkgname-dev $pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/dpdk/dpdk/archive/v$pkgver.tar.gz"
+subpackages="$pkgname-test:_test $pkgname-examples $pkgname-static $pkgname-dev $pkgname-doc"
+source="$pkgname-$pkgver.tar.gz::https://github.com/dpdk/dpdk/archive/v$pkgver.tar.gz
+	no-execinfo.patch
+	"
 
 build() {
 	abuild-meson -Denable_docs=true . output
@@ -46,9 +47,11 @@ examples() {
 	amove usr/share/dpdk/examples
 }
 
-test() {
+_test() {
 	amove usr/bin/$pkgname-test*
 }
+
 sha512sums="
 86892f5f61ee8f7ccd61c47767515603683d0e7a217389490a9a5d4ac87b42557572113f4cd56425fef212eff5715095a34ed3c03a3ce6351ffdcacb850b0851  dpdk-22.07.tar.gz
+8fc6978a3706bf880490efb486257ab3c305a59b1caf5d8d5e59ed558abe4986b993cb8d7161f6489b9a348cf8acec335cf3e97c34936c4234ea0d9f10c38f7a  no-execinfo.patch
 "
diff --git a/testing/dpdk/no-execinfo.patch b/testing/dpdk/no-execinfo.patch
new file mode 100644
index 00000000000..977a8c57c99
--- /dev/null
+++ b/testing/dpdk/no-execinfo.patch
@@ -0,0 +1,12 @@
+diff --git a/config/rte_config.h b/config/rte_config.h
+index 46549cb..f374677 100644
+--- a/config/rte_config.h
++++ b/config/rte_config.h
+@@ -37,7 +37,6 @@
+ #define RTE_MAX_MEMZONE 2560
+ #define RTE_MAX_TAILQ 32
+ #define RTE_LOG_DP_LEVEL RTE_LOG_INFO
+-#define RTE_BACKTRACE 1
+ #define RTE_MAX_VFIO_CONTAINERS 64
+ 
+ /* bsd module defines */