pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/graphics/MesaLib18 MesaLib18: always prefer the builti...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/472596c0cbaf
branches:  trunk
changeset: 318090:472596c0cbaf
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sat Jan 19 18:43:21 2019 +0000

description:
MesaLib18: always prefer the builtin libelf

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

diffstat:

 graphics/MesaLib18/options.mk |  11 ++---------
 1 files changed, 2 insertions(+), 9 deletions(-)

diffs (39 lines):

diff -r 9795e78bbe22 -r 472596c0cbaf graphics/MesaLib18/options.mk
--- a/graphics/MesaLib18/options.mk     Sat Jan 19 18:26:30 2019 +0000
+++ b/graphics/MesaLib18/options.mk     Sat Jan 19 18:43:21 2019 +0000
@@ -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+=                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+=                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 @@
 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



Home | Main Index | Thread Index | Old Index