From owner-svn-ports-all@freebsd.org Mon May 25 12:00:23 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 671982FD1B1; Mon, 25 May 2020 12:00:23 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49Vwdg0Nrcz4t0W; Mon, 25 May 2020 12:00:23 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B033A11AC5; Mon, 25 May 2020 12:00:22 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04PC0Muv010297; Mon, 25 May 2020 12:00:22 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04PC0MeX010296; Mon, 25 May 2020 12:00:22 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <202005251200.04PC0MeX010296@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Mon, 25 May 2020 12:00:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r536463 - head/x11/nvidia-driver X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: head/x11/nvidia-driver X-SVN-Commit-Revision: 536463 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 May 2020 12:00:23 -0000 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