Mon Mar 20 23:59:01 2017 UTC ()
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.


(gdt)
diff -r1.135 -r1.136 pkgsrc/graphics/MesaLib/Makefile
diff -r1.53 -r1.54 pkgsrc/graphics/MesaLib/options.mk
cvs diff -r1.135 -r1.136 pkgsrc/graphics/MesaLib/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/Makefile 2017/03/02 06:00:03 1.135
+++ pkgsrc/graphics/MesaLib/Makefile 2017/03/20 23:59:01 1.136
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.135 2017/03/02 06:00:03 maya Exp $ 1# $NetBSD: Makefile,v 1.136 2017/03/20 23:59:01 gdt Exp $
2 2
3DISTNAME= mesa-11.2.2 3DISTNAME= mesa-11.2.2
4PKGNAME= ${DISTNAME:S/mesa/MesaLib/} 4PKGNAME= ${DISTNAME:S/mesa/MesaLib/}
5PKGREVISION= 3 5PKGREVISION= 4
6CATEGORIES= graphics x11 6CATEGORIES= graphics x11
7MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/${PKGVERSION_NOREV}/ 7MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/${PKGVERSION_NOREV}/
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.mesa3d.org/ 11HOMEPAGE= http://www.mesa3d.org/
12COMMENT= The Mesa 3D Graphics Library 12COMMENT= The Mesa 3D Graphics Library
13LICENSE= mit 13LICENSE= mit
14 14
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16USE_TOOLS+= bison pkg-config gmake flex 16USE_TOOLS+= bison pkg-config gmake flex
17USE_LANGUAGES= c99 c++ 17USE_LANGUAGES= c99 c++
18USE_LIBTOOL= yes 18USE_LIBTOOL= yes
cvs diff -r1.53 -r1.54 pkgsrc/graphics/MesaLib/options.mk (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/options.mk 2017/03/09 09:51:04 1.53
+++ pkgsrc/graphics/MesaLib/options.mk 2017/03/20 23:59:01 1.54
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1# $NetBSD: options.mk,v 1.53 2017/03/09 09:51:04 jperkin Exp $ 1# $NetBSD: options.mk,v 1.54 2017/03/20 23:59:01 gdt Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.MesaLib 3PKG_OPTIONS_VAR= PKG_OPTIONS.MesaLib
4PKG_SUPPORTED_OPTIONS= llvm dri 4PKG_SUPPORTED_OPTIONS= llvm dri
5PKG_SUGGESTED_OPTIONS= 5PKG_SUGGESTED_OPTIONS=
6 6
7# The LLVM option enables JIT accelerated software rendering and 7# The LLVM option enables JIT accelerated software rendering and
8# is also required to support the latest RADEON GPUs, so enable it 8# is also required to support the latest RADEON GPUs, so enable it
9# by default on platforms where such GPUs might be encountered. 9# by default on platforms where such GPUs might be encountered.
10.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && \ 10.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && \
11 ${OPSYS} != "SunOS" 11 ${OPSYS} != "SunOS" && ${OPSYS} != "Darwin"
12PKG_SUGGESTED_OPTIONS+= llvm 12PKG_SUGGESTED_OPTIONS+= llvm
13.endif 13.endif
14 14
15.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" || \ 15.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" || \
16 ${OPSYS} == "DragonFly" || ${OPSYS} == "Linux" || \ 16 ${OPSYS} == "DragonFly" || ${OPSYS} == "Linux" || \
17 ${OPSYS} == "SunOS" || ${OPSYS} == "NetBSD" || \ 17 ${OPSYS} == "SunOS" || ${OPSYS} == "NetBSD" || \
18 ${OPSYS} == "Darwin" 18 ${OPSYS} == "Darwin"
19PKG_SUGGESTED_OPTIONS+= dri 19PKG_SUGGESTED_OPTIONS+= dri
20.endif 20.endif
21 21
22.include "../../mk/bsd.options.mk" 22.include "../../mk/bsd.options.mk"
23 23
24# gallium 24# gallium