pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics/MesaLib MesaLib: Disable llvm when not dri.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/4bb347176aa0
branches:  trunk
changeset: 400164:4bb347176aa0
user:      nia <nia%pkgsrc.org@localhost>
date:      Fri Aug 23 11:07:37 2019 +0000

description:
MesaLib: Disable llvm when not dri.

diffstat:

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

diffs (28 lines):

diff -r 0e7d11ec9092 -r 4bb347176aa0 graphics/MesaLib/options.mk
--- a/graphics/MesaLib/options.mk       Fri Aug 23 11:07:04 2019 +0000
+++ b/graphics/MesaLib/options.mk       Fri Aug 23 11:07:37 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.66 2019/08/22 17:24:01 nia Exp $
+# $NetBSD: options.mk,v 1.67 2019/08/23 11:07:37 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.MesaLib
 PKG_SUPPORTED_OPTIONS=         llvm dri wayland
@@ -229,7 +229,6 @@
 .  else # !llvm
 MESON_ARGS+=           -Dgallium-xa=false
 MESON_ARGS+=           -Dllvm=false
-MESON_ARGS+=           -Dllvm-shared=false
 .  endif # llvm
 PLIST_SUBST+=          GLVER="1.2.0"
 MESON_ARGS+=           -Dgallium-drivers=${GALLIUM_DRIVERS:ts,}
@@ -248,9 +247,7 @@
 MESON_ARGS+=           -Dgles2=false
 MESON_ARGS+=           -Dglx=xlib
 MESON_ARGS+=           -Dplatforms=x11
-.  if !empty(PKG_OPTIONS:Mllvm)
-PKG_FAIL_REASON+=      "The llvm PKG_OPTION must also be disabled when dri is disabled"
-.  endif
+MESON_ARGS+=           -Dllvm=false
 .endif # dri
 
 .if !empty(PKG_OPTIONS:Mgallium-xvmc)



Home | Main Index | Thread Index | Old Index