From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D832F139083 for ; Wed, 13 Dec 2017 01:12:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DC708E0E06; Wed, 13 Dec 2017 01:12:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AA86FE0E06 for ; Wed, 13 Dec 2017 01:12:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2608F341933 for ; Wed, 13 Dec 2017 01:12:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AE253AE77 for ; Wed, 13 Dec 2017 01:12:37 +0000 (UTC) From: "Aric Belsito" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aric Belsito" Message-ID: <1513127513.aa222c14bc8cb16654abcf7b809f09bc0ce6c512.lluixhi@gentoo> Subject: [gentoo-commits] proj/musl:master commit in: media-libs/mesa/files/ X-VCS-Repository: proj/musl X-VCS-Files: media-libs/mesa/files/mesa-17-musl-pthread.patch X-VCS-Directories: media-libs/mesa/files/ X-VCS-Committer: lluixhi X-VCS-Committer-Name: Aric Belsito X-VCS-Revision: aa222c14bc8cb16654abcf7b809f09bc0ce6c512 X-VCS-Branch: master Date: Wed, 13 Dec 2017 01:12:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0aedd2d8-4b18-4b23-b124-6e620fb6c6ef X-Archives-Hash: 83e5fafcfe733ca578b4d67e370e9b1b commit: aa222c14bc8cb16654abcf7b809f09bc0ce6c512 Author: Aric Belsito gmail com> AuthorDate: Wed Dec 13 01:11:53 2017 +0000 Commit: Aric Belsito gmail com> CommitDate: Wed Dec 13 01:11:53 2017 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=aa222c14 media-libs/mesa: fix ifdef guards in pthread patch media-libs/mesa/files/mesa-17-musl-pthread.patch | 44 +++++++++--------------- 1 file changed, 17 insertions(+), 27 deletions(-) diff --git a/media-libs/mesa/files/mesa-17-musl-pthread.patch b/media-libs/mesa/files/mesa-17-musl-pthread.patch index a488b69..aac95af 100644 --- a/media-libs/mesa/files/mesa-17-musl-pthread.patch +++ b/media-libs/mesa/files/mesa-17-musl-pthread.patch @@ -1,49 +1,39 @@ diff -Naur mesa-17.3.0.orig/src/gallium/state_trackers/nine/nine_debug.c mesa-17.3.0/src/gallium/state_trackers/nine/nine_debug.c ---- mesa-17.3.0.orig/src/gallium/state_trackers/nine/nine_debug.c 2017-12-08 05:49:11.000000000 -0800 -+++ mesa-17.3.0/src/gallium/state_trackers/nine/nine_debug.c 2017-12-11 14:24:00.264798233 -0800 -@@ -73,11 +73,8 @@ +--- mesa-17.3.0.orig/src/gallium/state_trackers/nine/nine_debug.c 2017-12-12 16:55:53.885552821 -0800 ++++ mesa-17.3.0/src/gallium/state_trackers/nine/nine_debug.c 2017-12-12 17:09:36.048538098 -0800 +@@ -73,8 +73,8 @@ } #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 (dbg_flags & DBG_TID) tid = pthread_self(); --# endif - #endif - - if (dbg_flags & flag) { + # endif diff -Naur mesa-17.3.0.orig/src/util/u_thread.h mesa-17.3.0/src/util/u_thread.h ---- mesa-17.3.0.orig/src/util/u_thread.h 2017-12-08 05:49:11.000000000 -0800 -+++ mesa-17.3.0/src/util/u_thread.h 2017-12-11 14:19:54.898802627 -0800 -@@ -34,6 +34,7 @@ - - #ifdef HAVE_PTHREAD - #include -+#include - #endif - - -@@ -61,10 +62,7 @@ +--- mesa-17.3.0.orig/src/util/u_thread.h 2017-12-12 16:55:53.915552820 -0800 ++++ mesa-17.3.0/src/util/u_thread.h 2017-12-12 17:09:34.079538133 -0800 +@@ -61,8 +61,8 @@ static inline void u_thread_setname( const char *name ) { #if defined(HAVE_PTHREAD) -# if defined(__GNU_LIBRARY__) && defined(__GLIBC__) && defined(__GLIBC_MINOR__) && \ - (__GLIBC__ >= 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12)) -- pthread_setname_np(pthread_self(), name); --# endif -+ prctl(PR_SET_NAME, name); ++# if defined(__linux__) && !(defined(__GLIBC__) || \ ++ (__GLIBC__ < 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 12))) + pthread_setname_np(pthread_self(), name); + # endif #endif - (void)name; - } -@@ -92,10 +90,7 @@ +@@ -92,8 +92,8 @@ static inline bool u_thread_is_self(thrd_t thread) { #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))) return pthread_equal(pthread_self(), thread); --# endif + # endif #endif - return false; - }