Merge branch 'core-updates'
[jackhill/guix/guix.git] / gnu / packages / patches / grep-gnulib-lock.patch
1 This patch fix error on 'gnulib' library required to build
2 'grep' package on GNU/Hurd.
3 The patch was adapted from upstream source repository:
4 '<http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commit;h=4084b3a1094372b960ce4a97634e08f4538c8bdd>'
5
6 Commit: 4084b3a1094372b960ce4a97634e08f4538c8bdd
7
8 diff --git a/lib/glthread/lock.c b/lib/glthread/lock.c
9 index 061562b..afc86f4 100644
10 --- a/lib/glthread/lock.c
11 +++ b/lib/glthread/lock.c
12 @@ -30,7 +30,7 @@
13
14 /* ------------------------- gl_rwlock_t datatype ------------------------- */
15
16 -# if HAVE_PTHREAD_RWLOCK && (HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER || (__GNU_LIBRARY__ > 1))
17 +# if HAVE_PTHREAD_RWLOCK && (HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER || (defined PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP && (__GNU_LIBRARY__ > 1)))
18
19 # ifdef PTHREAD_RWLOCK_INITIALIZER
20
21 diff --git a/lib/glthread/lock.h b/lib/glthread/lock.h
22 index ec16d39..67932aa 100644
23 --- a/lib/glthread/lock.h
24 +++ b/lib/glthread/lock.h
25 @@ -179,7 +179,7 @@ typedef pthread_mutex_t gl_lock_t;
26
27 /* ------------------------- gl_rwlock_t datatype ------------------------- */
28
29 -# if HAVE_PTHREAD_RWLOCK && (HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER || (__GNU_LIBRARY__ > 1))
30 +# if HAVE_PTHREAD_RWLOCK && (HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER || (defined PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP && (__GNU_LIBRARY__ > 1)))
31
32 # ifdef PTHREAD_RWLOCK_INITIALIZER