CVS commit: pkgsrc/graphics/MesaLib

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Apr  9 16:48:09 UTC 2020

Modified Files:
        pkgsrc/graphics/MesaLib: Makefile options.mk

Log Message:
MesaLib: Make ELF TLS optional.


To generate a diff of this commit:
cvs rdiff -u -r1.191 -r1.192 pkgsrc/graphics/MesaLib/Makefile
cvs rdiff -u -r1.79 -r1.80 pkgsrc/graphics/MesaLib/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/MesaLib/Makefile
diff -u pkgsrc/graphics/MesaLib/Makefile:1.191 pkgsrc/graphics/MesaLib/Makefile:1.192
--- pkgsrc/graphics/MesaLib/Makefile:1.191      Tue Apr  7 13:20:40 2020
+++ pkgsrc/graphics/MesaLib/Makefile    Thu Apr  9 16:48:08 2020
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.191 2020/04/07 13:20:40 nia Exp $
+# $NetBSD: Makefile,v 1.192 2020/04/09 16:48:08 nia Exp $
 
 DISTNAME=      mesa-20.0.4
 PKGNAME=       ${DISTNAME:S/mesa/MesaLib/}
+PKGREVISION=   1
 CATEGORIES=    graphics
 MASTER_SITES=  https://mesa.freedesktop.org/archive/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/graphics/MesaLib/options.mk
diff -u pkgsrc/graphics/MesaLib/options.mk:1.79 pkgsrc/graphics/MesaLib/options.mk:1.80
--- pkgsrc/graphics/MesaLib/options.mk:1.79     Sat Jan  4 01:53:55 2020
+++ pkgsrc/graphics/MesaLib/options.mk  Thu Apr  9 16:48:08 2020
@@ -1,10 +1,10 @@
-# $NetBSD: options.mk,v 1.79 2020/01/04 01:53:55 nia Exp $
+# $NetBSD: options.mk,v 1.80 2020/04/09 16:48:08 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.MesaLib
 
 .include "features.mk"
 
-PKG_SUPPORTED_OPTIONS+=                llvm vulkan x11
+PKG_SUPPORTED_OPTIONS+=                elf-tls llvm vulkan x11
 
 .if ${MESALIB_SUPPORTS_DRI} == "yes"
 PKG_SUPPORTED_OPTIONS+=                wayland
@@ -16,6 +16,8 @@ PKG_SUGGESTED_OPTIONS+=               wayland
 
 PKG_SUGGESTED_OPTIONS+=                x11
 
+.include "../../mk/bsd.fast.prefs.mk"
+
 # The LLVM option enables JIT accelerated software rendering and is also
 # required to support the latest RADEON GPUs.
 #
@@ -29,6 +31,15 @@ PKG_SUGGESTED_OPTIONS+=              x11
 PKG_SUGGESTED_OPTIONS+=                llvm
 .endif
 
+# ELF TLS is broken in at least the following cases:
+# - NetBSD with SDL2 without X11
+# - Linux with musl libc
+#
+# https://gitlab.freedesktop.org/mesa/mesa/issues/966
+.if ${OPSYS} == "Linux" && !empty(GLIBC_VERSION)
+PKG_SUGGESTED_OPTIONS+=                elf-tls
+.endif
+
 .include "../../mk/bsd.options.mk"
 
 # Gallium drivers requiring LLVM
@@ -41,6 +52,13 @@ PLIST_VARS+= wayland glx
 PLIST_VARS+=   vdpau
 
 #
+# ELF TLS support
+#
+.if empty(PKG_OPTIONS:Melf-tls)
+BUILDLINK_TRANSFORM+=  rm:-DUSE_ELF_TLS
+.endif
+
+#
 # LLVM support
 #
 .if !empty(PKG_OPTIONS:Mllvm)