Thu Apr 9 16:54:22 2020 UTC ()
MesaLib: ELF TLS is broken on FreeBSD too


(nia)
diff -r1.80 -r1.81 pkgsrc/graphics/MesaLib/options.mk
cvs diff -r1.80 -r1.81 pkgsrc/graphics/MesaLib/options.mk (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/options.mk 2020/04/09 16:48:08 1.80
+++ pkgsrc/graphics/MesaLib/options.mk 2020/04/09 16:54:22 1.81
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.80 2020/04/09 16:48:08 nia Exp $ 1# $NetBSD: options.mk,v 1.81 2020/04/09 16:54:22 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.MesaLib 3PKG_OPTIONS_VAR= PKG_OPTIONS.MesaLib
4 4
5.include "features.mk" 5.include "features.mk"
6 6
7PKG_SUPPORTED_OPTIONS+= elf-tls llvm vulkan x11 7PKG_SUPPORTED_OPTIONS+= elf-tls llvm vulkan x11
8 8
9.if ${MESALIB_SUPPORTS_DRI} == "yes" 9.if ${MESALIB_SUPPORTS_DRI} == "yes"
10PKG_SUPPORTED_OPTIONS+= wayland 10PKG_SUPPORTED_OPTIONS+= wayland
11. include "../../devel/wayland/platform.mk" 11. include "../../devel/wayland/platform.mk"
12. if ${PLATFORM_SUPPORTS_WAYLAND} == "yes" 12. if ${PLATFORM_SUPPORTS_WAYLAND} == "yes"
13PKG_SUGGESTED_OPTIONS+= wayland 13PKG_SUGGESTED_OPTIONS+= wayland
14. endif 14. endif
@@ -23,26 +23,27 @@ PKG_SUGGESTED_OPTIONS+= x11 @@ -23,26 +23,27 @@ PKG_SUGGESTED_OPTIONS+= x11
23# 23#
24# Enable it by default on platforms where such GPUs might be encountered or 24# Enable it by default on platforms where such GPUs might be encountered or
25# LLVM-accelerated software rendering might be useful. 25# LLVM-accelerated software rendering might be useful.
26.if ${MESALIB_SUPPORTS_DRI} == "yes" && \ 26.if ${MESALIB_SUPPORTS_DRI} == "yes" && \
27 ${OPSYS} != "SunOS" && \ 27 ${OPSYS} != "SunOS" && \
28 (${MACHINE_ARCH} == "i386" || \ 28 (${MACHINE_ARCH} == "i386" || \
29 ${MACHINE_ARCH} == "x86_64" || \ 29 ${MACHINE_ARCH} == "x86_64" || \
30 ${MACHINE_ARCH} == "aarch64") 30 ${MACHINE_ARCH} == "aarch64")
31PKG_SUGGESTED_OPTIONS+= llvm 31PKG_SUGGESTED_OPTIONS+= llvm
32.endif 32.endif
33 33
34# ELF TLS is broken in at least the following cases: 34# ELF TLS is broken in at least the following cases:
35# - NetBSD with SDL2 without X11 35# - NetBSD with SDL2 without X11
 36# - FreeBSD - https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3559
36# - Linux with musl libc 37# - Linux with musl libc
37# 38#
38# https://gitlab.freedesktop.org/mesa/mesa/issues/966 39# https://gitlab.freedesktop.org/mesa/mesa/issues/966
39.if ${OPSYS} == "Linux" && !empty(GLIBC_VERSION) 40.if ${OPSYS} == "Linux" && !empty(GLIBC_VERSION)
40PKG_SUGGESTED_OPTIONS+= elf-tls 41PKG_SUGGESTED_OPTIONS+= elf-tls
41.endif 42.endif
42 43
43.include "../../mk/bsd.options.mk" 44.include "../../mk/bsd.options.mk"
44 45
45# Gallium drivers requiring LLVM 46# Gallium drivers requiring LLVM
46PLIST_VARS+= r600 radeonsi 47PLIST_VARS+= r600 radeonsi
47 48
48# Windowing systems 49# Windowing systems