pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

MesaLib-dfbsd: Fix build on FreeBSD 11.0-STABLE



Module Name:	pkgsrc-wip
Committed By:	David Shao <davshao%gmail.com@localhost>
Pushed By:	dshao
Date:		Fri Jan 20 16:27:52 2017 -0800
Changeset:	b1dd5ac66f3a95d6d3a75e26aa02aa8b9a3de73c

Modified Files:
	MesaLib-dfbsd/options.mk

Log Message:
MesaLib-dfbsd: Fix build on FreeBSD 11.0-STABLE

Do not build nouveau parts on FreeBSD 11.0-STABLE since it
uses llvm 3.9 as its system compiler.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b1dd5ac66f3a95d6d3a75e26aa02aa8b9a3de73c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 MesaLib-dfbsd/options.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diffs:
diff --git a/MesaLib-dfbsd/options.mk b/MesaLib-dfbsd/options.mk
index 3a55587..0a6cf62 100644
--- a/MesaLib-dfbsd/options.mk
+++ b/MesaLib-dfbsd/options.mk
@@ -151,7 +151,10 @@ PLIST.vc4=		yes
 PLIST.r600=		yes
 GALLIUM_DRIVERS+=	r600
 
-.if ${OPSYS} != "FreeBSD" || empty(OS_VERSION:M12.*)
+FULL_OS_VERSION_CMD=	${UNAME} -r
+FULL_OS_VERSION=	${FULL_OS_VERSION_CMD:sh}
+
+.if ${OPSYS} != "FreeBSD" || (empty(FULL_OS_VERSION:M11.0-STABLE) && empty(OS_VERSION:M12.*))
 # nVidia
 PLIST.nouveau=		yes
 GALLIUM_DRIVERS+=	nouveau
@@ -165,7 +168,7 @@ DRI_DRIVERS+=		radeon
 PLIST.r200_dri=		yes
 DRI_DRIVERS+=		r200
 
-.if ${OPSYS} != "FreeBSD" || empty(OS_VERSION:M12.*)
+.if ${OPSYS} != "FreeBSD" || (empty(FULL_OS_VERSION:M11.0-STABLE) && empty(OS_VERSION:M12.*))
 # classic DRI nouveau
 PLIST.nouveau_dri=	yes
 DRI_DRIVERS+=		nouveau


Home | Main Index | Thread Index | Old Index