From ad5f0deeef9758b6edf536243e448bb392eb2ab8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Wed, 10 Nov 2021 21:16:02 -0300 Subject: [PATCH] elfutils: update to 0.186. --- ...ompilation-on-platforms-without-erro.patch | 35 +++++++++++++++++++ srcpkgs/elfutils/template | 6 ++-- 2 files changed, 38 insertions(+), 3 deletions(-) create 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 new file mode 100644 index 0000000000..329baac253 --- /dev/null +++ b/srcpkgs/elfutils/patches/0001-debuginfod-fix-compilation-on-platforms-without-erro.patch @@ -0,0 +1,35 @@ +From: =?UTF-8?q?=C3=89rico=20Nogueira?= +Date: Wed, 10 Nov 2021 21:11:55 -0300 +Subject: [PATCH] debuginfod: fix compilation on platforms without + +"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 +--- + 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 +-#include + + #include + #ifdef __GNUC__ +-- +2.33.1 + diff --git a/srcpkgs/elfutils/template b/srcpkgs/elfutils/template index 9b7ab6beb6..5d37eb20ee 100644 --- a/srcpkgs/elfutils/template +++ b/srcpkgs/elfutils/template @@ -1,6 +1,6 @@ # Template file for 'elfutils' pkgname=elfutils -version=0.185 +version=0.186 revision=1 build_style=gnu-configure configure_args="--program-prefix=eu-" @@ -14,12 +14,12 @@ maintainer="Érico Nogueira " license="GPL-3.0-or-later" homepage="https://sourceware.org/elfutils/" distfiles="https://sourceware.org/${pkgname}/ftp/${version}/${pkgname}-${version}.tar.bz2" -checksum=dc8d3e74ab209465e7f568e1b3bb9a5a142f8656e2b57d10049a73da2ae6b5a6 +checksum=7f6fb9149b1673d38d9178a0d3e0fb8a1ec4f53a9f4c2ff89469609879641177 # subpackages require explicit ordering subpackages="debuginfod libdebuginfod libelf elfutils-devel" if [ "$XBPS_TARGET_LIBC" = musl ]; then - makedepends+=" argp-standalone musl-fts-devel musl-obstack-devel musl-legacy-compat" + makedepends+=" argp-standalone musl-fts-devel musl-obstack-devel" # mainly warnings from using error.h CFLAGS="-Wno-error"