[pkgsrc/trunk]: pkgsrc/graphics/MesaLib mesalib: disable dri *and* llvm in th...

[maya <maya%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/43c903535b95
branches:  trunk
changeset: 309554:43c903535b95
user:      maya <maya%pkgsrc.org@localhost>
date:      Wed Jun 20 01:37:15 2018 +0000

description:
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.

diffstat:

 graphics/MesaLib/options.mk |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 1f0b50ac2e16 -r 43c903535b95 graphics/MesaLib/options.mk
--- a/graphics/MesaLib/options.mk       Tue Jun 19 22:58:56 2018 +0000
+++ b/graphics/MesaLib/options.mk       Wed Jun 20 01:37:15 2018 +0000
@@ -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 @@
 # 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