Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 10 Jul 2019 15:41:55 +0000 (UTC)
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r506356 - head/x11/nvidia-driver
Message-ID:  <201907101541.x6AFftt8050286@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tijl
Date: Wed Jul 10 15:41:55 2019
New Revision: 506356
URL: https://svnweb.freebsd.org/changeset/ports/506356

Log:
  Use LINUX_DEFAULT unmodified.  The _64 suffix is no longer used.  Also
  compare with c6 instead of c7 because c6 is expected to be the only
  distribution that doesn't use libglvnd from now on.

Modified:
  head/x11/nvidia-driver/Makefile

Modified: head/x11/nvidia-driver/Makefile
==============================================================================
--- head/x11/nvidia-driver/Makefile	Wed Jul 10 15:10:38 2019	(r506355)
+++ head/x11/nvidia-driver/Makefile	Wed Jul 10 15:41:55 2019	(r506356)
@@ -296,7 +296,7 @@ PLIST_SUB+=	LINUXBASE=${LINUXBASE} \
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MLINUX}
-.if ${NVVERSION} >= 390.042 && ${LINUX_DEFAULT:S/_64//} == c7
+.if ${NVVERSION} >= 390.042 && ${LINUX_DEFAULT} != c6
 USE_LINUX+=	libglvnd
 PLIST_RE+=	'\,${LINUXBASE}.*libEGL\.so,d' \
 		'\,${LINUXBASE}.*libGL\.so,d' \
@@ -392,7 +392,7 @@ LINUX32_LIBS+=	libGLdispatch.so.0 \
 PLIST_RE+=	'\,${LINUXBASE}.*libGLdispatch\.so,d' \
 		'\,${LINUXBASE}.*libOpenGL\.so,d'
 .endif
-.endif	# ${NVVERSION} >= 390.042 && ${LINUX_DEFAULT:S/_64//} == c7
+.endif	# ${NVVERSION} >= 390.042 && ${LINUX_DEFAULT} != c6
 
 .if ${ARCH} == amd64
 .if ${NVVERSION} >= 310.014



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201907101541.x6AFftt8050286>