From 685d58b21a6259dfdae912a674b1c3eb2f6569cd Mon Sep 17 00:00:00 2001 From: Alexey Dokuchaev Date: Mon, 25 May 2020 12:00:22 +0000 Subject: [PATCH] - 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 --- x11/nvidia-driver/Makefile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile index 3b2bfd23c6a0..deb464c5eec3 100644 --- a/x11/nvidia-driver/Makefile +++ b/x11/nvidia-driver/Makefile @@ -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