summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaya <maya@pkgsrc.org>2017-03-02 06:00:03 +0000
committermaya <maya@pkgsrc.org>2017-03-02 06:00:03 +0000
commit97e8b51518545453a9a9f978034cd98c116ada1d (patch)
tree7c30ced3b53aa7473b8b650d377c32f370040752
parent8defcccb3ef85910fbd26cd032f947e9b92f1364 (diff)
downloadpkgsrc-97e8b51518545453a9a9f978034cd98c116ada1d.tar.gz
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.
-rw-r--r--graphics/MesaLib/Makefile4
-rw-r--r--graphics/MesaLib/options.mk15
2 files changed, 4 insertions, 15 deletions
diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile
index 087e2fefb5b..7745e652a00 100644
--- a/graphics/MesaLib/Makefile
+++ b/graphics/MesaLib/Makefile
@@ -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
diff --git a/graphics/MesaLib/options.mk b/graphics/MesaLib/options.mk
index cb56dc4099f..29fadfaa8bd 100644
--- a/graphics/MesaLib/options.mk
+++ b/graphics/MesaLib/options.mk
@@ -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