diff options
| author | gdt <gdt@pkgsrc.org> | 2017-03-20 23:59:01 +0000 |
|---|---|---|
| committer | gdt <gdt@pkgsrc.org> | 2017-03-20 23:59:01 +0000 |
| commit | 9a5025370f9855b65e2cd5592832233fbb762191 (patch) | |
| tree | 8161a15aff3af28f121b4f21d6def001c64fa8a9 | |
| parent | b66be052b6e2c2c47edec7de2e48e8e96b7fd86b (diff) | |
| download | pkgsrc-9a5025370f9855b65e2cd5592832233fbb762191.tar.gz | |
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.
| -rw-r--r-- | graphics/MesaLib/Makefile | 4 | ||||
| -rw-r--r-- | graphics/MesaLib/options.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile index 7745e652a00..0997a6ccdbb 100644 --- a/graphics/MesaLib/Makefile +++ b/graphics/MesaLib/Makefile @@ -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 diff --git a/graphics/MesaLib/options.mk b/graphics/MesaLib/options.mk index 7965fefc680..01f43b3cbe4 100644 --- a/graphics/MesaLib/options.mk +++ b/graphics/MesaLib/options.mk @@ -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 |