CVS commit: pkgsrc/graphics/MesaLib

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Thu Mar  2 06:00:03 UTC 2017

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

Log Message:
MesaLib: enable llvm option on all x86 platforms, and not on non-x86.

It's for the AMDGPU driver. I don't know of any ARM boards, but that may
change in the future. highly unlikely for SPARC.

Also lift the minimum GCC requirement for linux llvm option - we use GCC_REQD
for the llvm package, and gcc48 works at least on CentOS 6.8 builds, so it'll
build fine.
Linux is will benefit from the AMDGPU driver, although it requires a new
kernel anyway.

bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.134 -r1.135 pkgsrc/graphics/MesaLib/Makefile
cvs rdiff -u -r1.51 -r1.52 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.134 pkgsrc/graphics/MesaLib/Makefile:1.135
--- pkgsrc/graphics/MesaLib/Makefile:1.134      Thu Mar  2 04:40:33 2017
+++ pkgsrc/graphics/MesaLib/Makefile    Thu Mar  2 06:00:03 2017
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.134 2017/03/02 04:40:33 maya Exp $
+# $NetBSD: Makefile,v 1.135 2017/03/02 06:00:03 maya Exp $
 
 DISTNAME=      mesa-11.2.2
 PKGNAME=       ${DISTNAME:S/mesa/MesaLib/}
-PKGREVISION=   2
+PKGREVISION=   3
 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.51 pkgsrc/graphics/MesaLib/options.mk:1.52
--- pkgsrc/graphics/MesaLib/options.mk:1.51     Thu Mar  2 05:37:22 2017
+++ pkgsrc/graphics/MesaLib/options.mk  Thu Mar  2 06:00:03 2017
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.51 2017/03/02 05:37:22 maya Exp $
+# $NetBSD: options.mk,v 1.52 2017/03/02 06:00:03 maya Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.MesaLib
 PKG_SUPPORTED_OPTIONS=         llvm dri
@@ -7,18 +7,7 @@ PKG_SUGGESTED_OPTIONS=
 # The LLVM option enables JIT accelerated software rendering and
 # is also required to support the latest RADEON GPUs, so enable it
 # by default on platforms where such GPUs might be encountered.
-.if \
-       !empty(MACHINE_PLATFORM:MNetBSD-[789].*-i386) ||        \
-       !empty(MACHINE_PLATFORM:MNetBSD-[789].*-x86_64) ||      \
-       !empty(MACHINE_PLATFORM:MNetBSD-[789].*-sparc64) ||     \
-       !empty(MACHINE_PLATFORM:MNetBSD-[789].*-*arm*)
-PKG_SUGGESTED_OPTIONS+=                llvm
-.endif
-
-.if    (!empty(MACHINE_PLATFORM:MLinux-*-i386) ||      \
-        !empty(MACHINE_PLATFORM:MLinux-*-x86_64)) &&   \
-       (!empty(CC_VERSION:Mgcc-4.[89].*) ||            \
-        !empty(CC_VERSION:Mgcc-[56].*))
+.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64")
 PKG_SUGGESTED_OPTIONS+=                llvm
 .endif