diff options
| author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2018-07-23 12:58:00 +0000 |
|---|---|---|
| committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2018-07-23 12:58:00 +0000 |
| commit | 80d698e975f22f4fa2fe9cf7d6ba7afc058a9988 (patch) | |
| tree | d4824b71c716c027c124d0aa9b68f217b5dc0aa3 /x11 | |
| parent | - Update to r4208 (diff) | |
Cleanup patch code that does nothing useful these days (changes are long
integrated upstream).
Notes
Notes:
svn path=/head/; revision=475170
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/nvidia-driver/Makefile | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile index a3d4cbe1030e..75711e8df380 100644 --- a/x11/nvidia-driver/Makefile +++ b/x11/nvidia-driver/Makefile @@ -119,18 +119,9 @@ post-patch: .SILENT ${REINPLACE_CMD} -E '/#include "machine\/\.\.\/linux(32)?\/linux.h"/ \ { x ; s/.*/#include "machine\/..\/..\/compat\/linux\/linux_ioctl.h"/ ; H ; x ; }' \ ${WRKSRC}/src/${NVSRC}/nvidia_linux.c -# Adjust `vm_object' locking after FreeBSD src r248084 and bogus memset() call - ${REINPLACE_CMD} -e '/#include <vm\/vm_object.h>/ \ - { x ; s/.*/#include <sys\/rwlock.h>/ ; G ; }' \ - ${WRKSRC}/src/${NVSRC}/nv-freebsd.h - ${REINPLACE_CMD} -E 's/(VM_OBJECT_)(UN)?(LOCK)/\1W\2\3/ ; \ - /memset/s/sizeof\(ci/sizeof(*ci/' \ - ${WRKSRC}/src/${NVSRC}/nvidia_subr.c -# Adjust kmem(9) calls after FreeBSD src r254025 -.if ${NVVERSION} < 331.067 - ${REINPLACE_CMD} -e '/kmem_/s/kernel_map/kernel_arena/' \ +# Fix bogus memset() call + ${REINPLACE_CMD} -e '/memset/s/sizeof(ci/sizeof(*ci/' \ ${WRKSRC}/src/${NVSRC}/nvidia_subr.c -.endif # Chase `sys/capability.h' rename to `sys/capsicum.h' in FreeBSD src r263232 ${REINPLACE_CMD} -e 's:sys/capability\.h:sys/capsicum.h:' \ ${WRKSRC}/src/${NVSRC}/nv-freebsd.h |