CVS commit: pkgsrc/graphics/MesaLib

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Mon Mar 20 23:59:01 UTC 2017

Modified Files:
        pkgsrc/graphics/MesaLib: Makefile options.mk

Log Message:
Do not suggest llvm option on Darwin

With llvm, the build fails, as apparently llvm turns on including
multiple libraries that do not build.  (Until recently, this option
was not enabled by default, so this change is essentially omitting
Darwin from the change to default to llvm in i386/x86_64.)

Thanks to maya@ for explaining/suggesting.


To generate a diff of this commit:
cvs rdiff -u -r1.135 -r1.136 pkgsrc/graphics/MesaLib/Makefile
cvs rdiff -u -r1.53 -r1.54 pkgsrc/graphics/MesaLib/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/MesaLib/Makefile
diff -u pkgsrc/graphics/MesaLib/Makefile:1.135 pkgsrc/graphics/MesaLib/Makefile:1.136
--- pkgsrc/graphics/MesaLib/Makefile:1.135      Thu Mar  2 06:00:03 2017
+++ pkgsrc/graphics/MesaLib/Makefile    Mon Mar 20 23:59:01 2017
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.135 2017/03/02 06:00:03 maya Exp $
+# $NetBSD: Makefile,v 1.136 2017/03/20 23:59:01 gdt Exp $
 
 DISTNAME=      mesa-11.2.2
 PKGNAME=       ${DISTNAME:S/mesa/MesaLib/}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    graphics x11
 MASTER_SITES=  ftp://ftp.freedesktop.org/pub/mesa/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/graphics/MesaLib/options.mk
diff -u pkgsrc/graphics/MesaLib/options.mk:1.53 pkgsrc/graphics/MesaLib/options.mk:1.54
--- pkgsrc/graphics/MesaLib/options.mk:1.53     Thu Mar  9 09:51:04 2017
+++ pkgsrc/graphics/MesaLib/options.mk  Mon Mar 20 23:59:01 2017
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.53 2017/03/09 09:51:04 jperkin Exp $
+# $NetBSD: options.mk,v 1.54 2017/03/20 23:59:01 gdt Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.MesaLib
 PKG_SUPPORTED_OPTIONS=         llvm dri
@@ -8,7 +8,7 @@ PKG_SUGGESTED_OPTIONS=
 # 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} != "SunOS" && ${OPSYS} != "Darwin"
 PKG_SUGGESTED_OPTIONS+=                llvm
 .endif