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 8F05E138334 for ; Sun, 7 Oct 2018 15:57:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3388DE09B7; Sun, 7 Oct 2018 15:57:11 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 09B2BE09B7 for ; Sun, 7 Oct 2018 15:57:10 +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 9C07E335C67 for ; Sun, 7 Oct 2018 15:57:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D06A63F8 for ; Sun, 7 Oct 2018 15:57:06 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1538927811.c574022b7d9ecd047be2c82223736b953b8f7d23.blueness@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-18-musl-pthread.patch X-VCS-Directories: media-libs/mesa/files/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: c574022b7d9ecd047be2c82223736b953b8f7d23 X-VCS-Branch: master Date: Sun, 7 Oct 2018 15:57:06 +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: eee0eeef-385a-43a5-a152-6ec38f75dde9 X-Archives-Hash: dd2bc8059bdf268d2d19ce3c88ce7770 commit: c574022b7d9ecd047be2c82223736b953b8f7d23 Author: Anthony G. Basile gentoo org> AuthorDate: Sun Oct 7 15:56:51 2018 +0000 Commit: Anthony G. Basile gentoo 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 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