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 3F5B3138334 for ; Thu, 14 Mar 2019 23:29:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0AE69E0878; Thu, 14 Mar 2019 23:29:51 +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 C7FF7E0878 for ; Thu, 14 Mar 2019 23:29:50 +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 2636F335CE9 for ; Thu, 14 Mar 2019 23:29:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0F6DD452 for ; Thu, 14 Mar 2019 23:29:46 +0000 (UTC) From: "Jory Pratt" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" Message-ID: <1552605987.c2ac367b649aeab3ce9cbf8e1184f204f255ad93.anarchy@gentoo> Subject: [gentoo-commits] proj/musl:master commit in: media-libs/mesa/, media-libs/mesa/files/ X-VCS-Repository: proj/musl X-VCS-Files: media-libs/mesa/files/mesa-18.2.4-add-disable-tls-support.patch media-libs/mesa/mesa-18.2.4.ebuild X-VCS-Directories: media-libs/mesa/files/ media-libs/mesa/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: c2ac367b649aeab3ce9cbf8e1184f204f255ad93 X-VCS-Branch: master Date: Thu, 14 Mar 2019 23:29:46 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2e7c910f-5189-4dfd-933b-653cec8a6d0b X-Archives-Hash: 77009e47e0c36c809e65ea48affdeec9 commit: c2ac367b649aeab3ce9cbf8e1184f204f255ad93 Author: Jory A. Pratt bull penguingeek> AuthorDate: Thu Mar 14 23:26:27 2019 +0000 Commit: Jory Pratt gentoo org> CommitDate: Thu Mar 14 23:26:27 2019 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=c2ac367b media-libs/mesa - address bug #670052 with upstream patch to disable tls .../mesa-18.2.4-add-disable-tls-support.patch | 46 ++++++++++++++++++++++ media-libs/mesa/mesa-18.2.4.ebuild | 6 +++ 2 files changed, 52 insertions(+) diff --git a/media-libs/mesa/files/mesa-18.2.4-add-disable-tls-support.patch b/media-libs/mesa/files/mesa-18.2.4-add-disable-tls-support.patch new file mode 100644 index 0000000..7eebc0d --- /dev/null +++ b/media-libs/mesa/files/mesa-18.2.4-add-disable-tls-support.patch @@ -0,0 +1,46 @@ +From beca1b215950f4e917c21f916fd3c16fb09fb3fa Mon Sep 17 00:00:00 2001 +From: root +Date: Wed, 6 Mar 2019 15:52:59 -0600 +Subject: [PATCH] Allow disable tls for musl + +--- + meson.build | 5 ++++- + meson_options.txt | 6 ++++++ + 2 files changed, 10 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 5b0eea1..d6a7675 100644 +--- a/meson.build ++++ b/meson.build +@@ -327,7 +327,10 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless) + endif + endif + +-pre_args += '-DGLX_USE_TLS' ++if get_option('glx-tls') ++ pre_args += '-DGLX_USE_TLS' ++endif ++ + if with_glx != 'disabled' + if not (with_platform_x11 and with_any_opengl) + error('Cannot build GLX support without X11 platform support and at least one OpenGL API') +diff --git a/meson_options.txt b/meson_options.txt +index 5bb560b..3b721a6 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -277,6 +277,12 @@ option( + choices : ['none', 'classic', 'gallium'], + description : 'Build OSmesa.' + ) ++option( ++ 'glx-tls', ++ type : 'boolean', ++ value : true, ++ description : 'Enable thread-local storage in GLX and EGL' ++) + option( + 'osmesa-bits', + type : 'combo', +-- +2.21.0 + diff --git a/media-libs/mesa/mesa-18.2.4.ebuild b/media-libs/mesa/mesa-18.2.4.ebuild index ab4c917..09f49a9 100644 --- a/media-libs/mesa/mesa-18.2.4.ebuild +++ b/media-libs/mesa/mesa-18.2.4.ebuild @@ -238,6 +238,7 @@ PATCHES=( "${FILESDIR}"/${PN}-18-musl-invocation_name.patch "${FILESDIR}"/${PN}-18-musl-pthread.patch "${FILESDIR}"/${PN}-18-musl-amdgpu-include-pthread.patch + "${FILESDIR}"/${P}-add-disable-tls-support.patch ) llvm_check_deps() { @@ -451,6 +452,11 @@ multilib_src_configure() { emesonargs+=( $(meson_use pax_kernel glx-read-only-text) ) fi + # Disable glx tls support on musl + if use elibc_musl; then + emesonargs+=( -Dglx-tls=false ) + fi + # on abi_x86_32 hardened we need to have asm disable if [[ ${ABI} == x86* ]] && use pic; then emesonargs+=( -Dasm=false )