Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 22 May 2019 07:49:41 +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: r502258 - head/x11/nvidia-driver
Message-ID:  <201905220749.x4M7nfAT068578@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Wed May 22 07:49:41 2019
New Revision: 502258
URL: https://svnweb.freebsd.org/changeset/ports/502258

Log:
  Unbreak the build after base (src) r347984.
  
  PR:	238018
  Differential Revision:	https://reviews.freebsd.org/D20350

Modified:
  head/x11/nvidia-driver/Makefile

Modified: head/x11/nvidia-driver/Makefile
==============================================================================
--- head/x11/nvidia-driver/Makefile	Wed May 22 07:48:30 2019	(r502257)
+++ head/x11/nvidia-driver/Makefile	Wed May 22 07:49:41 2019	(r502258)
@@ -434,6 +434,11 @@ post-patch: .SILENT
 	    -e 's/kmem_free(kmem_arena, /kmem_free(/' \
 		${WRKSRC}/src/${NVSRC}/nvidia_subr.c
 .endif
+# Pull the right header after FreeBSD src r347984
+.if ${OSVERSION} >= 1300029 && ${NVVERSION} >= 358.009
+	${REINPLACE_CMD} -e '/^#include/s:lock\.h:mutex.h:' \
+		${WRKSRC}/src/nvidia-modeset/nvidia-modeset-freebsd.c
+.endif
 # Disable installation of Linux libraries
 	${REINPLACE_CMD} -e 's/exists(\/.*/& \&\& 0/' \
 		${WRKSRC}/lib/Makefile



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