diff --git a/srcpkgs/watchman/patches/musl_configure.patch b/srcpkgs/watchman/patches/musl_configure.patch new file mode 100644 index 00000000000..be945de1923 --- /dev/null +++ b/srcpkgs/watchman/patches/musl_configure.patch @@ -0,0 +1,33 @@ +--- configure.ac ++++ configure.ac +@@ -251,6 +251,8 @@ AC_CHECK_HEADERS(CoreServices/CoreServices.h, [ + ]) + AC_CHECK_FUNCS(backtrace backtrace_symbols backtrace_symbols_fd) + ++AC_CHECK_FUNCS_ONCE(sys_siglist) ++ + if test -n "$ac_cv_header_sys_statvfs_h"; then + AC_CHECK_MEMBERS([struct statvfs.f_fstypename,struct statvfs.f_basetype], + [AC_DEFINE([STATVFS_HAS_FSTYPE_AS_STRING], [1],[if statvfs holds fstype as string])],[],[[#include ]]) +--- log.c ++++ log.c +@@ -78,11 +78,19 @@ static void crash_handler(int signo, siginfo_t *si, void *ucontext) { + dprintf(STDERR_FILENO, + "Terminating due to signal %d %s " + "generated by pid=%d uid=%d. %s (%p)\n", ++#ifdef HAVE_SYS_SIGLIST + signo, sys_siglist[signo], si->si_pid, si->si_uid, ++#else ++ signo, strsignal(signo), si->si_pid, si->si_uid, ++#endif + reason, si->si_value.sival_ptr); + } else { + dprintf(STDERR_FILENO, "Terminating due to signal %d %s. %s\n", ++#ifdef HAVE_SYS_SIGLIST + signo, sys_siglist[signo], reason); ++#else ++ signo, strsignal(signo), reason); ++#endif + } + + #if defined(HAVE_BACKTRACE) && defined(HAVE_BACKTRACE_SYMBOLS_FD) diff --git a/srcpkgs/watchman/patches/muslc.patch b/srcpkgs/watchman/patches/muslc.patch deleted file mode 100644 index e8520dead43..00000000000 --- a/srcpkgs/watchman/patches/muslc.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- log.c.bck 2016-02-14 04:34:21.822095670 -0500 -+++ log.c 2016-02-14 04:35:35.669233860 -0500 -@@ -78,11 +78,11 @@ - dprintf(STDERR_FILENO, - "Terminating due to signal %d %s " - "generated by pid=%d uid=%d. %s (%p)\n", -- signo, sys_siglist[signo], si->si_pid, si->si_uid, -+ signo, strsignal(signo), si->si_pid, si->si_uid, - reason, si->si_value.sival_ptr); - } else { - dprintf(STDERR_FILENO, "Terminating due to signal %d %s. %s\n", -- signo, sys_siglist[signo], reason); -+ signo, strsignal(signo), reason); - } - - #if defined(HAVE_BACKTRACE) && defined(HAVE_BACKTRACE_SYMBOLS_FD) diff --git a/srcpkgs/watchman/template b/srcpkgs/watchman/template index 333601e61bd..b5184ac3e93 100644 --- a/srcpkgs/watchman/template +++ b/srcpkgs/watchman/template @@ -1,6 +1,6 @@ # Template file for 'watchman' pkgname=watchman -version=4.4.0 +version=4.5.0 revision=1 build_style=gnu-configure hostmakedepends="automake libtool" @@ -10,7 +10,7 @@ maintainer="Juan RP " license="Apache-2.0" homepage="https://facebook.github.io/watchman/" distfiles="https://github.com/facebook/watchman/archive/v${version}.tar.gz" -checksum=6fdd830584e59d0c70d06c5776d3ab68eb0cfe81ec2c071455bf04df84d9aee2 +checksum=ef11ad11f3b79a09232a27d993331cc8b686fe06a8f0e7c777cb50cc198020f6 pre_configure() { sed -i 's,sys/poll.h,poll.h,g' *.[ch]