summaryrefslogtreecommitdiffstats
path: root/graphics-libs
diff options
context:
space:
mode:
authorPavel Vinogradov2022-07-31 20:10:14 -0400
committerPavel Vinogradov2022-07-31 20:22:25 -0400
commit0172f792def1f25e6ea1a8c7b8ac97faa7899d50 (patch)
treead9d925f066c797532379bf539a14b0f369feda7 /graphics-libs
parent033010aee037f8ead7e9246af5f9fe5db9a61375 (diff)
graphics-libs/mesa: moved the patch about use_elf_tls to stable, scm has it
enabled always now
Diffstat (limited to 'graphics-libs')
-rwxr-xr-xgraphics-libs/mesa/BUILD5
-rw-r--r--graphics-libs/mesa/HISTORY4
-rw-r--r--graphics-libs/mesa/patches-stable/add-use-elf-tls.patch (renamed from graphics-libs/mesa/patches/add-use-elf-tls.patch)0
3 files changed, 8 insertions, 1 deletions
diff --git a/graphics-libs/mesa/BUILD b/graphics-libs/mesa/BUILD
index 26e377e6c0..97fc5891c4 100755
--- a/graphics-libs/mesa/BUILD
+++ b/graphics-libs/mesa/BUILD
@@ -20,6 +20,10 @@ case "$HOST" in
MESA_TOOLS="${MESA_TOOLS% }"
;;
esac &&
+if [[ "${MESA_BRANCH}" == "stable" ]]; then
+ OPTS+=" use-elf-tls=false"
+fi &&
+
local vulkan=${MESA_VULKAN//none} &&
local gallium=${MESA_GALLIUM//none} &&
local dri=${MESA_DRI//none} &&
@@ -29,7 +33,6 @@ OPTS+=" gallium-drivers=${gallium// /,} \
platforms=${MESA_EGL// /,} \
glx=${MESA_GLX// /,} \
tools=${MESA_TOOLS// /,} \
- use-elf-tls=false \
$MESA_GLES1 $MESA_GLES2" &&
default_build
diff --git a/graphics-libs/mesa/HISTORY b/graphics-libs/mesa/HISTORY
index 6e8cd990ce..1d1aca077b 100644
--- a/graphics-libs/mesa/HISTORY
+++ b/graphics-libs/mesa/HISTORY
@@ -1,3 +1,7 @@
+2022-07-31 Pavel Vinogradov <public@sourcemage.org>
+ * BUILD, patches{,-{,stable}/add-use-elf-tls.patch: moved the patch and option
+ to enable/disable ELF_TLS to stable, scm autodetects it now
+
2022-07-16 Pavel Vinogradov <public@sourcemage.org>
* DETAILS: version 22.1.4
diff --git a/graphics-libs/mesa/patches/add-use-elf-tls.patch b/graphics-libs/mesa/patches-stable/add-use-elf-tls.patch
index b22246c81c..b22246c81c 100644
--- a/graphics-libs/mesa/patches/add-use-elf-tls.patch
+++ b/graphics-libs/mesa/patches-stable/add-use-elf-tls.patch