diff --git a/srcpkgs/ProcDump-for-Linux/patches/musl.patch b/srcpkgs/ProcDump-for-Linux/patches/musl.patch new file mode 100644 index 00000000000..4154095cf04 --- /dev/null +++ b/srcpkgs/ProcDump-for-Linux/patches/musl.patch @@ -0,0 +1,61 @@ +From 4654429b1c4b21a630b2157dcb1a02628b3eb9d2 Mon Sep 17 00:00:00 2001 +From: Will Dietz +Date: Mon, 19 Nov 2018 12:54:03 -0600 +Subject: [PATCH] Rename variable sigset -> sig_set to avoid conflict + w/function sigset (#50) + +Fixes build with musl. +--- + src/ProcDumpConfiguration.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git src/ProcDumpConfiguration.c src/ProcDumpConfiguration.c +index 28215a4..73f7bbd 100644 +--- src/ProcDumpConfiguration.c ++++ src/ProcDumpConfiguration.c +@@ -12,7 +12,7 @@ + + struct Handle g_evtConfigurationInitialized = HANDLE_MANUAL_RESET_EVENT_INITIALIZER("ConfigurationInitialized"); + +-static sigset_t sigset; ++static sigset_t sig_set; + static pthread_t sig_thread_id; + + //-------------------------------------------------------------------- +@@ -25,7 +25,7 @@ void *SignalThread(void *input) + struct ProcDumpConfiguration *self = (struct ProcDumpConfiguration *)input; + int sig_caught, rc; + +- if ((rc = sigwait(&sigset, &sig_caught)) != 0) { ++ if ((rc = sigwait(&sig_set, &sig_caught)) != 0) { + Log(error, "Failed to wait on signal"); + exit(-1); + } +@@ -466,23 +466,23 @@ int CreateTriggerThreads(struct ProcDumpConfiguration *self) + int rc = 0; + self->nThreads = 0; + +- if((rc=sigemptyset (&sigset)) < 0) ++ if((rc=sigemptyset (&sig_set)) < 0) + { + Trace("CreateTriggerThreads: sigemptyset failed."); + return rc; + } +- if((rc=sigaddset (&sigset, SIGINT)) < 0) ++ if((rc=sigaddset (&sig_set, SIGINT)) < 0) + { + Trace("CreateTriggerThreads: sigaddset failed."); + return rc; + } +- if((rc=sigaddset (&sigset, SIGTERM)) < 0) ++ if((rc=sigaddset (&sig_set, SIGTERM)) < 0) + { + Trace("CreateTriggerThreads: sigaddset failed."); + return rc; + } + +- if((rc = pthread_sigmask (SIG_BLOCK, &sigset, NULL)) != 0) ++ if((rc = pthread_sigmask (SIG_BLOCK, &sig_set, NULL)) != 0) + { + Trace("CreateTriggerThreads: pthread_sigmask failed."); + return rc; diff --git a/srcpkgs/ProcDump-for-Linux/template b/srcpkgs/ProcDump-for-Linux/template index 4f090afda7e..9c7a6e38ddb 100644 --- a/srcpkgs/ProcDump-for-Linux/template +++ b/srcpkgs/ProcDump-for-Linux/template @@ -1,21 +1,17 @@ # Template file for 'ProcDump-for-Linux' pkgname=ProcDump-for-Linux version=1.0.1 -revision=1 +revision=2 build_style=gnu-makefile makedepends="zlib-devel" depends="gdb" short_desc="ProcDump-for-Linux provides a way to create core dumps" -maintainer="" +maintainer="" license="MIT" homepage="https://github.com/Microsoft/ProcDump-for-Linux" distfiles="https://github.com/Microsoft/${pkgname}/archive/${version}.tar.gz" checksum=284b92a83ea7763b3edb5a300b8ef97c2c2a4a69c2efaca4822423b71c605a14 -case "${XBPS_TARGET_MACHINE}" in - *-musl) broken="https://travis-ci.org/void-linux/void-packages/jobs/471949081";; -esac - post_install() { vlicense LICENSE }