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 49261524a64b8d81d5353d21c036cd24ff43b87f..018bc4eb332fc6e68a6bec86b3aa90866b900c06 100644 (file)
--- 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 d812aa999054cfa1dd1ee12d5322abde3bf64a5c..360a1f140c71d6292a5d91d6edda848bc2576caa 100644 (file)
--- 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