From 5b81df06974555fd43e2df0ed5064b0af7b46182 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 30 Apr 2022 23:57:06 -0300
Subject: [PATCH] elfutils: update to 0.187.

Update checkdepends for glibc; for musl, tests no longer compile
properly due to using error(3) functions. To avoid uncaught test
failures, add conditional so glibc with debug packages enabled results
in failures if tests error out.
---
 ...ompilation-on-platforms-without-erro.patch | 35 -------------------
 srcpkgs/elfutils/template                     | 17 ++++++---
 2 files changed, 12 insertions(+), 40 deletions(-)
 delete mode 100644 srcpkgs/elfutils/patches/0001-debuginfod-fix-compilation-on-platforms-without-erro.patch

diff --git a/srcpkgs/elfutils/patches/0001-debuginfod-fix-compilation-on-platforms-without-erro.patch b/srcpkgs/elfutils/patches/0001-debuginfod-fix-compilation-on-platforms-without-erro.patch
deleted file mode 100644
index 329baac2537..00000000000
--- a/srcpkgs/elfutils/patches/0001-debuginfod-fix-compilation-on-platforms-without-erro.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-Date: Wed, 10 Nov 2021 21:11:55 -0300
-Subject: [PATCH] debuginfod: fix compilation on platforms without <error.h>
-
-"system.h" only declares the error() function, so it needs to be in an
-'extern "C"' block, otherwise linking fails.
-
-Since we are here, use quotes for "system.h" header, since it's a local
-header, not a system one.
-
-Signed-off-by: Érico Nogueira <erico.erc@gmail.com>
----
- debuginfod/debuginfod.cxx | 2 +-
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/debuginfod/debuginfod.cxx b/debuginfod/debuginfod.cxx
-index 521cb529..764e7b94 100644
---- a/debuginfod/debuginfod.cxx
-+++ b/debuginfod/debuginfod.cxx
-@@ -33,11 +33,11 @@
- 
- extern "C" {
- #include "printversion.h"
-+#include "system.h"
- }
- 
- #include "debuginfod.h"
- #include <dwarf.h>
--#include <system.h>
- 
- #include <argp.h>
- #ifdef __GNUC__
--- 
-2.33.1
-
diff --git a/srcpkgs/elfutils/template b/srcpkgs/elfutils/template
index 5d37eb20eeb..1fe41abe92d 100644
--- a/srcpkgs/elfutils/template
+++ b/srcpkgs/elfutils/template
@@ -1,6 +1,6 @@
 # Template file for 'elfutils'
 pkgname=elfutils
-version=0.186
+version=0.187
 revision=1
 build_style=gnu-configure
 configure_args="--program-prefix=eu-"
@@ -8,13 +8,13 @@ hostmakedepends="automake libtool pkg-config"
 _devel_depends="bzip2-devel liblzma-devel zlib-devel libzstd-devel"
 makedepends="${_devel_depends} libcurl-devel libarchive-devel sqlite-devel
  libmicrohttpd-devel"
-checkdepends="zstd bzip2 curl rpm cpio"
+checkdepends="zstd bzip2 curl rpm cpio iproute2 procps-ng"
 short_desc="Utilities to handle ELF object files"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://sourceware.org/elfutils/"
 distfiles="https://sourceware.org/${pkgname}/ftp/${version}/${pkgname}-${version}.tar.bz2"
-checksum=7f6fb9149b1673d38d9178a0d3e0fb8a1ec4f53a9f4c2ff89469609879641177
+checksum=e70b0dfbe610f90c4d1fe0d71af142a4e25c3c4ef9ebab8d2d72b65159d454c8
 # subpackages require explicit ordering
 subpackages="debuginfod libdebuginfod libelf elfutils-devel"
 
@@ -31,8 +31,15 @@ fi
 
 do_check() {
 	# test failures also expected if building with debug disabled
-	make check ${makejobs} ||
-		msg_warn "Failure in testsuite, expected on musl systems, at least\n"
+	make check ${makejobs} || {
+		if [ "$XBPS_TARGET_LIBC" = musl ]; then
+			msg_warn "Expected testsuite failure: using musl\n"
+		elif [ -z "$XBPS_DEBUG_PKGS" ]; then
+			msg_warn "Expected testsuite failure: debug is disabled\n"
+		else
+			msg_error "Testsuite failure\n"
+		fi
+	}
 }
 
 libdebuginfod_package() {