From: Bruno Haible <bruno@clisp.org>
Date: Mon, 12 Aug 2019 03:29:00 +0000 (-0600)
Subject: build: adjust for recent gnulib pthread changes
X-Git-Tag: v8.32~56
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3d070fa3269e89dfad49fde8ea30758afa36f4b;p=thirdparty%2Fcoreutils.git

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.
---

diff --git a/bootstrap.conf b/bootstrap.conf
index 49261524a6..018bc4eb33 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 d812aa9990..360a1f140c 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