commit: c574022b7d9ecd047be2c82223736b953b8f7d23
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 7 15:56:51 2018 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Oct 7 15:56:51 2018 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=c574022b
media-libs/mesa: fix mesa-18-musl-pthread.patch, fix issue 173
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.10
media-libs/mesa/files/mesa-18-musl-pthread.patch | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/media-libs/mesa/files/mesa-18-musl-pthread.patch
b/media-libs/mesa/files/mesa-18-musl-pthread.patch
index 2db1667..a6af63e 100644
--- a/media-libs/mesa/files/mesa-18-musl-pthread.patch
+++ b/media-libs/mesa/files/mesa-18-musl-pthread.patch
@@ -7,8 +7,8 @@ diff -Naur
mesa-18.0.0-rc2.orig/src/gallium/state_trackers/nine/nine_debug.c mes
#if defined(HAVE_PTHREAD)
-# if defined(__GNU_LIBRARY__) && defined(__GLIBC__) &&
defined(__GLIBC_MINOR__) && \
- (__GLIBC__ >= 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12))
-+# if defined(__linux__) && !(defined(__GLIBC__) || \
-+ (__GLIBC__ < 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 12)))
++# if defined(__linux__) && (!defined(__GLIBC__) || \
++ __GLIBC__ >= 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12))
if (dbg_flags & DBG_TID)
tid = pthread_self();
# endif
@@ -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
-# if defined(__GNU_LIBRARY__) && defined(__GLIBC__) &&
defined(__GLIBC_MINOR__) && \
- (__GLIBC__ >= 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12)) && \
- defined(__linux__)
-+# if defined(__linux__) && !(defined(__GLIBC__) || \
-+ (__GLIBC__ < 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 12)))
++# if defined(__linux__) && (!defined(__GLIBC__) || \
++ __GLIBC__ >= 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12))
pthread_setname_np(pthread_self(), name);
# endif
#endif
@@ -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
-# if defined(__GNU_LIBRARY__) && defined(__GLIBC__) &&
defined(__GLIBC_MINOR__) && \
- (__GLIBC__ >= 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12))
+# if defined(__linux__) && !(defined(__GLIBC__) || \
-+ (__GLIBC__ < 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 12)))
++ __GLIBC__ >= 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12))
return pthread_equal(pthread_self(), thread);
# endif
#endif
