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 CC7E6139083 for ; Mon, 11 Dec 2017 22:29:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 611E6E0F7D; Mon, 11 Dec 2017 22:29:57 +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 2E553E0F7D for ; Mon, 11 Dec 2017 22:29:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 7F36933BF55 for ; Mon, 11 Dec 2017 22:29:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C4920AE65 for ; Mon, 11 Dec 2017 22:29:53 +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: <1513031363.9322efe89c8b65579c2216ec96978dd5ad608753.lluixhi@gentoo> Subject: [gentoo-commits] proj/musl:master commit in: media-libs/mesa/files/, media-libs/mesa/ X-VCS-Repository: proj/musl X-VCS-Files: media-libs/mesa/files/mesa-17-execinfo.patch media-libs/mesa/mesa-17.3.0.ebuild X-VCS-Directories: media-libs/mesa/ media-libs/mesa/files/ X-VCS-Committer: lluixhi X-VCS-Committer-Name: Aric Belsito X-VCS-Revision: 9322efe89c8b65579c2216ec96978dd5ad608753 X-VCS-Branch: master Date: Mon, 11 Dec 2017 22:29:53 +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: 4394abbc-a7e8-4c63-b4aa-c9478340a1e0 X-Archives-Hash: 7ba841ab005a8f0af90aa2ceb7540e29 commit: 9322efe89c8b65579c2216ec96978dd5ad608753 Author: Aric Belsito gmail com> AuthorDate: Mon Dec 11 22:29:23 2017 +0000 Commit: Aric Belsito gmail com> CommitDate: Mon Dec 11 22:29:23 2017 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=9322efe8 media-libs/mesa: fix patch media-libs/mesa/files/mesa-17-execinfo.patch | 77 ++++++++++++++++++++++++++++ media-libs/mesa/mesa-17.3.0.ebuild | 2 +- 2 files changed, 78 insertions(+), 1 deletion(-) diff --git a/media-libs/mesa/files/mesa-17-execinfo.patch b/media-libs/mesa/files/mesa-17-execinfo.patch new file mode 100644 index 0000000..87b2ce6 --- /dev/null +++ b/media-libs/mesa/files/mesa-17-execinfo.patch @@ -0,0 +1,77 @@ +diff -Naur mesa-17.3.0.orig/configure.ac mesa-17.3.0/configure.ac +--- mesa-17.3.0.orig/configure.ac 2017-12-08 05:49:11.000000000 -0800 ++++ mesa-17.3.0/configure.ac 2017-12-11 14:11:53.587811247 -0800 +@@ -794,6 +794,7 @@ + AC_CHECK_FUNC([strtof], [DEFINES="$DEFINES -DHAVE_STRTOF"]) + AC_CHECK_FUNC([mkostemp], [DEFINES="$DEFINES -DHAVE_MKOSTEMP"]) + AC_CHECK_FUNC([memfd_create], [DEFINES="$DEFINES -DHAVE_MEMFD_CREATE"]) ++AC_CHECK_HEADER([execinfo.h], [DEFINES="$DEFINES -DHAVE_EXECINFO_H"]) + + AC_MSG_CHECKING([whether strtod has locale support]) + AC_LINK_IFELSE([AC_LANG_SOURCE([[ +diff -Naur mesa-17.3.0.orig/src/gallium/auxiliary/util/u_debug_symbol.c mesa-17.3.0/src/gallium/auxiliary/util/u_debug_symbol.c +--- mesa-17.3.0.orig/src/gallium/auxiliary/util/u_debug_symbol.c 2017-12-08 05:49:11.000000000 -0800 ++++ mesa-17.3.0/src/gallium/auxiliary/util/u_debug_symbol.c 2017-12-11 14:13:52.780809112 -0800 +@@ -219,7 +219,7 @@ + #endif /* PIPE_OS_WINDOWS */ + + +-#if defined(__GLIBC__) && !defined(__UCLIBC__) ++#if defined(HAVE_EXECINFO_H) + + #include + +@@ -240,7 +240,7 @@ + return TRUE; + } + +-#endif /* defined(__GLIBC__) && !defined(__UCLIBC__) */ ++#endif /* defined(HAVE_EXECINFO_H) */ + + + void +@@ -252,7 +252,7 @@ + } + #endif + +-#if defined(__GLIBC__) && !defined(__UCLIBC__) ++#if defined(HAVE_EXECINFO_H) + if (debug_symbol_name_glibc(addr, buf, size)) { + return; + } +diff -Naur mesa-17.3.0.orig/src/mapi/glapi/gen/gl_gentable.py mesa-17.3.0/src/mapi/glapi/gen/gl_gentable.py +--- mesa-17.3.0.orig/src/mapi/glapi/gen/gl_gentable.py 2017-12-08 05:49:11.000000000 -0800 ++++ mesa-17.3.0/src/mapi/glapi/gen/gl_gentable.py 2017-12-11 14:11:53.587811247 -0800 +@@ -43,7 +43,7 @@ + #endif + + #if (defined(GLXEXT) && defined(HAVE_BACKTRACE)) \\ +- || (!defined(GLXEXT) && defined(DEBUG) && !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)) ++ || (!defined(GLXEXT) && defined(DEBUG) && defined(HAVE_EXECINFO_H)) + #define USE_BACKTRACE + #endif + +diff -Naur mesa-17.3.0.orig/src/mapi/glapi/glapi_gentable.c mesa-17.3.0/src/mapi/glapi/glapi_gentable.c +--- mesa-17.3.0.orig/src/mapi/glapi/glapi_gentable.c 2017-12-08 05:49:45.000000000 -0800 ++++ mesa-17.3.0/src/mapi/glapi/glapi_gentable.c 2017-12-11 14:11:53.588811247 -0800 +@@ -36,7 +36,7 @@ + #endif + + #if (defined(GLXEXT) && defined(HAVE_BACKTRACE)) \ +- || (!defined(GLXEXT) && defined(DEBUG) && !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)) ++ || (!defined(GLXEXT) && defined(DEBUG) && defined(HAVE_EXECINFO_H)) + #define USE_BACKTRACE + #endif + +diff -Naur mesa-17.3.0.orig/src/mesa/drivers/dri/i915/intel_regions.c mesa-17.3.0/src/mesa/drivers/dri/i915/intel_regions.c +--- mesa-17.3.0.orig/src/mesa/drivers/dri/i915/intel_regions.c 2017-12-08 05:49:11.000000000 -0800 ++++ mesa-17.3.0/src/mesa/drivers/dri/i915/intel_regions.c 2017-12-11 14:11:53.588811247 -0800 +@@ -57,7 +57,7 @@ + */ + #define DEBUG_BACKTRACE_SIZE 0 + +-#if DEBUG_BACKTRACE_SIZE == 0 ++#if DEBUG_BACKTRACE_SIZE == 0 || !defined(HAVE_EXECINFO_H) + /* Use the standard debug output */ + #define _DBG(...) DBG(__VA_ARGS__) + #else diff --git a/media-libs/mesa/mesa-17.3.0.ebuild b/media-libs/mesa/mesa-17.3.0.ebuild index 1513134..49ae075 100644 --- a/media-libs/mesa/mesa-17.3.0.ebuild +++ b/media-libs/mesa/mesa-17.3.0.ebuild @@ -280,7 +280,7 @@ pkg_setup() { } src_prepare() { - eapply "${FILESDIR}"/${PN}-11-execinfo.patch + eapply "${FILESDIR}"/${PN}-17-execinfo.patch eapply "${FILESDIR}"/${PN}-13-musl_endian.patch eautoreconf