On Sun, Aug 11, 2019 at 09:33:47PM -0600, Assaf Gordon wrote: > Hello, > > On Sun, Aug 11, 2019 at 10:42:49AM +0200, Bruno Haible wrote: > > A couple of changes in gnulib on 2019-07-15 [1] need updates on the > > coreutils > > side, the next you update the gnulib used by coreutils. > > Thanks for the heads-up. > > Patch attached - I'll apply it tomorrow if there are no further comments. >
Updated patch (fixed typo in commit message).
>From fc120af40548e63a98644f9f0999975710259a00 Mon Sep 17 00:00:00 2001 From: Bruno Haible <br...@clisp.org> Date: Sun, 11 Aug 2019 21:29:00 -0600 Subject: [PATCH] build: adjust for recent gnulib pthread changes Discussed in https://lists.gnu.org/r/coreutils/2019-08/msg00030.html . * bootstrap.conf (gnulib_modules): Replace 'pthread' with pthread-* modules. * src/sort.c: Remove GNULIB_defined_pthread_functions conditional. --- bootstrap.conf | 5 ++++- src/sort.c | 5 ----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index 49261524a..018bc4eb3 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -196,7 +196,10 @@ gnulib_modules=" priv-set progname propername - pthread + pthread-cond + pthread-mutex + pthread-thread + pthread_sigmask putenv quote quotearg diff --git a/src/sort.c b/src/sort.c index d812aa999..360a1f140 100644 --- a/src/sort.c +++ b/src/sort.c @@ -82,11 +82,6 @@ struct rlimit { size_t rlim_cur; }; # endif #endif -#if GNULIB_defined_pthread_functions -# undef pthread_sigmask -# define pthread_sigmask(how, set, oset) sigprocmask (how, set, oset) -#endif - #if !defined OPEN_MAX && defined NR_OPEN # define OPEN_MAX NR_OPEN #endif -- 2.20.1
