Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 25 May 2020 12:00:22 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r536463 - head/x11/nvidia-driver
Message-ID:  <202005251200.04PC0MeX010296@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Mon May 25 12:00:22 2020
New Revision: 536463
URL: https://svnweb.freebsd.org/changeset/ports/536463

Log:
  - When WITH_DEBUG is set, pass through DEBUG_FLAGS to the kmod build
  - While here, remove old gimmicks of having to explicitly set NVIDIA_ROOT
    and pass down X11BASE (all drivers use LOCALBASE since versions 304.125
    and 310.51)
  
  Differential Revision:	https://reviews.freebsd.org/D24836

Modified:
  head/x11/nvidia-driver/Makefile

Modified: head/x11/nvidia-driver/Makefile
==============================================================================
--- head/x11/nvidia-driver/Makefile	Mon May 25 11:44:11 2020	(r536462)
+++ head/x11/nvidia-driver/Makefile	Mon May 25 12:00:22 2020	(r536463)
@@ -35,15 +35,9 @@ USES=		kmod uidfix xorg
 USE_XORG=	x11 xorg-server xext
 USE_LDCONFIG=	yes
 
-# NVIDIA_ROOT is not set in src/Makefile, which results in bogus -I/src
-# passed to compiler and broken build on HEAD since r221320 when option
-# -Wmissing-include-dirs was added for kernel sources.  Until properly
-# fixed upstream (across all versions, including legacy ones), use this
-# hack below to universally set NVIDIA_ROOT.  Also provide X11BASE value
-# since it is still used by legacy drivers.
 GLVND_JSON_PATH=	${PREFIX}/share/glvnd/egl_vendor.d
 WAYLAND_JSON_PATH=	${PREFIX}/share/egl/egl_external_platform.d
-MAKE_ENV=	NVIDIA_ROOT=${WRKSRC} X11BASE=${LOCALBASE} \
+MAKE_ENV=	DEBUG_FLAGS=${DEBUG_FLAGS} \
 		EGL_GLVND_JSON_PATH=${STAGEDIR}${GLVND_JSON_PATH} \
 		EGL_WAYLAND_JSON_PATH=${STAGEDIR}${WAYLAND_JSON_PATH}
 SUB_FILES=	pkg-message nvidia.conf



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