Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: media-libs/mesa/files/
Date: Sun, 07 Oct 2018 15:57:12
Message-Id: 1538927811.c574022b7d9ecd047be2c82223736b953b8f7d23.blueness@gentoo
1 commit: c574022b7d9ecd047be2c82223736b953b8f7d23
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 7 15:56:51 2018 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 7 15:56:51 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=c574022b
7
8 media-libs/mesa: fix mesa-18-musl-pthread.patch, fix issue 173
9
10 Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
11 Package-Manager: Portage-2.3.49, Repoman-2.3.10
12
13 media-libs/mesa/files/mesa-18-musl-pthread.patch | 10 +++++-----
14 1 file changed, 5 insertions(+), 5 deletions(-)
15
16 diff --git a/media-libs/mesa/files/mesa-18-musl-pthread.patch b/media-libs/mesa/files/mesa-18-musl-pthread.patch
17 index 2db1667..a6af63e 100644
18 --- a/media-libs/mesa/files/mesa-18-musl-pthread.patch
19 +++ b/media-libs/mesa/files/mesa-18-musl-pthread.patch
20 @@ -7,8 +7,8 @@ diff -Naur mesa-18.0.0-rc2.orig/src/gallium/state_trackers/nine/nine_debug.c mes
21 #if defined(HAVE_PTHREAD)
22 -# if defined(__GNU_LIBRARY__) && defined(__GLIBC__) && defined(__GLIBC_MINOR__) && \
23 - (__GLIBC__ >= 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12))
24 -+# if defined(__linux__) && !(defined(__GLIBC__) || \
25 -+ (__GLIBC__ < 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 12)))
26 ++# if defined(__linux__) && (!defined(__GLIBC__) || \
27 ++ __GLIBC__ >= 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12))
28 if (dbg_flags & DBG_TID)
29 tid = pthread_self();
30 # endif
31 @@ -22,8 +22,8 @@ diff -Naur mesa-18.0.0-rc2.orig/src/util/u_thread.h mesa-18.0.0-rc2/src/util/u_t
32 -# if defined(__GNU_LIBRARY__) && defined(__GLIBC__) && defined(__GLIBC_MINOR__) && \
33 - (__GLIBC__ >= 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12)) && \
34 - defined(__linux__)
35 -+# if defined(__linux__) && !(defined(__GLIBC__) || \
36 -+ (__GLIBC__ < 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 12)))
37 ++# if defined(__linux__) && (!defined(__GLIBC__) || \
38 ++ __GLIBC__ >= 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12))
39 pthread_setname_np(pthread_self(), name);
40 # endif
41 #endif
42 @@ -34,7 +34,7 @@ diff -Naur mesa-18.0.0-rc2.orig/src/util/u_thread.h mesa-18.0.0-rc2/src/util/u_t
43 -# if defined(__GNU_LIBRARY__) && defined(__GLIBC__) && defined(__GLIBC_MINOR__) && \
44 - (__GLIBC__ >= 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12))
45 +# if defined(__linux__) && !(defined(__GLIBC__) || \
46 -+ (__GLIBC__ < 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 12)))
47 ++ __GLIBC__ >= 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12))
48 return pthread_equal(pthread_self(), thread);
49 # endif
50 #endif