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.
This commit is contained in:
Érico Nogueira 2022-04-30 23:57:06 -03:00
parent afd03afc84
commit 5b81df0697
2 changed files with 12 additions and 40 deletions

View file

@ -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

View file

@ -1,6 +1,6 @@
# Template file for 'elfutils' # Template file for 'elfutils'
pkgname=elfutils pkgname=elfutils
version=0.186 version=0.187
revision=1 revision=1
build_style=gnu-configure build_style=gnu-configure
configure_args="--program-prefix=eu-" configure_args="--program-prefix=eu-"
@ -8,13 +8,13 @@ hostmakedepends="automake libtool pkg-config"
_devel_depends="bzip2-devel liblzma-devel zlib-devel libzstd-devel" _devel_depends="bzip2-devel liblzma-devel zlib-devel libzstd-devel"
makedepends="${_devel_depends} libcurl-devel libarchive-devel sqlite-devel makedepends="${_devel_depends} libcurl-devel libarchive-devel sqlite-devel
libmicrohttpd-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" short_desc="Utilities to handle ELF object files"
maintainer="Érico Nogueira <ericonr@disroot.org>" maintainer="Érico Nogueira <ericonr@disroot.org>"
license="GPL-3.0-or-later" license="GPL-3.0-or-later"
homepage="https://sourceware.org/elfutils/" homepage="https://sourceware.org/elfutils/"
distfiles="https://sourceware.org/${pkgname}/ftp/${version}/${pkgname}-${version}.tar.bz2" distfiles="https://sourceware.org/${pkgname}/ftp/${version}/${pkgname}-${version}.tar.bz2"
checksum=7f6fb9149b1673d38d9178a0d3e0fb8a1ec4f53a9f4c2ff89469609879641177 checksum=e70b0dfbe610f90c4d1fe0d71af142a4e25c3c4ef9ebab8d2d72b65159d454c8
# subpackages require explicit ordering # subpackages require explicit ordering
subpackages="debuginfod libdebuginfod libelf elfutils-devel" subpackages="debuginfod libdebuginfod libelf elfutils-devel"
@ -31,8 +31,15 @@ fi
do_check() { do_check() {
# test failures also expected if building with debug disabled # test failures also expected if building with debug disabled
make check ${makejobs} || make check ${makejobs} || {
msg_warn "Failure in testsuite, expected on musl systems, at least\n" 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() { libdebuginfod_package() {