jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

ProcDump-for-Linux: update to 1.1

Browse source 
Signed-off-by: Nathan Owens <ndowens04@gmail.com>
This commit is contained in:
Nathan Owens 2019-12-14 16:10:44 -06:00 committed by Juan RP
parent 2d6dafa5e9
commit ed5daf7831
2 changed files with 3 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
srcpkgs/ProcDump-for-Linux/files/musl.patch
View file

@ -1,61 +0,0 @@
From 4654429b1c4b21a630b2157dcb1a02628b3eb9d2 Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
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;

13
srcpkgs/ProcDump-for-Linux/template
View file

@ -1,7 +1,7 @@
# Template file for 'ProcDump-for-Linux' # Template file for 'ProcDump-for-Linux'
pkgname=ProcDump-for-Linux pkgname=ProcDump-for-Linux
version=1.0.1 version=1.1
revision=3 revision=1
build_style=gnu-makefile build_style=gnu-makefile
makedepends="zlib-devel" makedepends="zlib-devel"
depends="gdb" depends="gdb"
@ -10,16 +10,9 @@ maintainer="<ndowens04@gmail.com>"
license="MIT" license="MIT"
homepage="https://github.com/Microsoft/ProcDump-for-Linux" homepage="https://github.com/Microsoft/ProcDump-for-Linux"
distfiles="https://github.com/Microsoft/${pkgname}/archive/${version}.tar.gz" distfiles="https://github.com/Microsoft/${pkgname}/archive/${version}.tar.gz"
checksum=284b92a83ea7763b3edb5a300b8ef97c2c2a4a69c2efaca4822423b71c605a14 checksum=f054dc4b3a59799ee9e53bf7ec0e1d9170ecde1037bd8fa8c3c3d7c9ba1a39c3
disable_parallel_build=yes disable_parallel_build=yes
case "$XBPS_TARGET_LIBC" in
musl)
pre_build() {
patch -Np0 < "$FILESDIR"/musl.patch
}
esac
post_install() { post_install() {
vlicense LICENSE vlicense LICENSE
} }