CVS commit: pkgsrc/graphics/MesaLib

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Wed Jun 20 01:37:15 UTC 2018

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

Log Message:
mesalib: disable dri *and* llvm in the netbsd native xorg case.

It isn't feasible to build this version of MesaLib with this option and
netbsd's base libraries.

PR pkg/52686.


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 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/options.mk
diff -u pkgsrc/graphics/MesaLib/options.mk:1.60 pkgsrc/graphics/MesaLib/options.mk:1.61
--- pkgsrc/graphics/MesaLib/options.mk:1.60     Fri Jun  1 14:54:43 2018
+++ pkgsrc/graphics/MesaLib/options.mk  Wed Jun 20 01:37:15 2018
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.60 2018/06/01 14:54:43 maya Exp $
+# $NetBSD: options.mk,v 1.61 2018/06/20 01:37:15 maya Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.MesaLib
 PKG_SUPPORTED_OPTIONS=         llvm dri
@@ -8,14 +8,15 @@ PKG_SUGGESTED_OPTIONS=
 # is also required to support the latest RADEON GPUs, so enable it
 # by default on platforms where such GPUs might be encountered.
 .if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && \
-       ${OPSYS} != "SunOS" && ${OPSYS} != "Darwin"
+       ${OPSYS} != "SunOS" && ${OPSYS} != "Darwin" && \
+       (${OPSYS} == "NetBSD" && ${X11_TYPE} == "modular")
 PKG_SUGGESTED_OPTIONS+=                llvm
 .endif
 
 .if ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" ||          \
        ${OPSYS} == "DragonFly" || ${OPSYS} == "Linux" ||       \
        ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin" ||          \
-       ${OPSYS} == "NetBSD"
+       (${OPSYS} == "NetBSD" && ${X11_TYPE} == "modular")
 PKG_SUGGESTED_OPTIONS+=                dri
 .endif