CVS commit: pkgsrc/graphics/MesaLib18

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat Jan 19 18:43:21 UTC 2019

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

Log Message:
MesaLib18: always prefer the builtin libelf

There seem to be issues with using pkgsrc libelf on every $OPSYS except
linux.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/graphics/MesaLib18/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/MesaLib18/options.mk
diff -u pkgsrc/graphics/MesaLib18/options.mk:1.7 pkgsrc/graphics/MesaLib18/options.mk:1.8
--- pkgsrc/graphics/MesaLib18/options.mk:1.7    Sat Jan 19 17:47:51 2019
+++ pkgsrc/graphics/MesaLib18/options.mk        Sat Jan 19 18:43:21 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2019/01/19 17:47:51 tnn Exp $
+# $NetBSD: options.mk,v 1.8 2019/01/19 18:43:21 tnn Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.MesaLib
 PKG_SUPPORTED_OPTIONS=         llvm dri
@@ -10,7 +10,6 @@ PKG_SUPPORTED_OPTIONS+=               osmesa
 PKG_SUPPORTED_OPTIONS+=                glesv1 glesv2
 PKG_SUPPORTED_OPTIONS+=                xa
 PKG_SUPPORTED_OPTIONS+=                noatexit
-PKG_SUPPORTED_OPTIONS+=                libelf
 PKG_SUPPORTED_OPTIONS+=                vulkan
 
 # PKG_SUGGESTED_OPTIONS+=              xvmc
@@ -47,12 +46,6 @@ PKG_SUGGESTED_OPTIONS+=              dri
 PKG_SUGGESTED_OPTIONS+=                glx-tls
 .endif
 
-# segfault starting x on FreeBSD 12 (current) if not using base libelf
-# WebGL demos and mpv not working for radeonsi on NetBSD
-.if ${OPSYS} != "FreeBSD" && ${OPSYS} != "NetBSD"
-PKG_SUGGESTED_OPTIONS+=                libelf
-.endif
-
 .include "../../mk/bsd.options.mk"
 
 # gallium
@@ -248,7 +241,7 @@ GALLIUM_DRIVERS+=   radeonsi
 CONFIGURE_ARGS+=       --enable-llvm
 CONFIGURE_ARGS+=       --enable-llvm-shared-libs
 
-.if !empty(PKG_OPTIONS:Mlibelf)
+.if !exists(/usr/include/libelf.h)
 .include "../../devel/libelf/buildlink3.mk"
 CPPFLAGS+=             -I${BUILDLINK_PREFIX.libelf}/include/libelf
 .endif