[pkgsrc/trunk]: pkgsrc/graphics/MesaLib MesaLib: Make feature detection in bu...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4657f15af4b5
branches:  trunk
changeset: 338779:4657f15af4b5
user:      nia <nia%pkgsrc.org@localhost>
date:      Fri Aug 30 16:30:54 2019 +0000

description:
MesaLib: Make feature detection in buildlink3 cleaner.

XXX not sure how to detect the special case of native X but
PREFER_PKGSRC=MesaLib safely

diffstat:

 graphics/MesaLib/buildlink3.mk |  24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)

diffs (42 lines):

diff -r 08322f7353d3 -r 4657f15af4b5 graphics/MesaLib/buildlink3.mk
--- a/graphics/MesaLib/buildlink3.mk    Fri Aug 30 16:00:47 2019 +0000
+++ b/graphics/MesaLib/buildlink3.mk    Fri Aug 30 16:30:54 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.60 2019/08/30 16:00:47 nia Exp $
+# $NetBSD: buildlink3.mk,v 1.61 2019/08/30 16:30:54 nia Exp $
 
 BUILDLINK_TREE+=       MesaLib
 
@@ -18,18 +18,24 @@
 
 pkgbase:= MesaLib
 
-.if    ${X11_TYPE} == "modular" && (${OPSYS} != "Darwin" && ${OPSYS} != "Cygwin") ||   \
-       ${X11_TYPE} == "native"  && exists(${X11BASE}/include/EGL/egl.h)
+.if ${X11_TYPE} == "modular"
+MESALIB_SUPPORTS_OS=   yes
+.  if ${OPSYS} != "Darwin" && ${OPSYS} != "Cygwin" && ${OPSYS} != "SunOS"
 MESALIB_SUPPORTS_EGL=  yes
-.else
+.  else
 MESALIB_SUPPORTS_EGL=  no
-.endif
-
-.if    ${X11_TYPE} == "modular" || \
-       ${X11_TYPE} == "native"  && exists(${X11BASE}/lib/libOSMesa.so)
+.  endif
+.else
+.  if exists(${X11BASE}/include/EGL/egl.h)
+MESALIB_SUPPORTS_EGL=  yes
+.  else
+MESALIB_SUPPORTS_EGL=  no
+.  endif
+.  if exists(${X11BASE}/lib/libOSMesa.so)
 MESALIB_SUPPORTS_OS=   yes
-.else
+.  else
 MESALIB_SUPPORTS_OS=   no
+.  endif
 .endif
 
 .include "../../mk/pkg-build-options.mk"