Bug 181972 - x11/nvidia-driver: nvidia_subr.c:835:46: error: too few arguments to function call, expected 10, have 9 (VM_PROT_READ | VM_PROT_WRITE), 0);
Summary: x11/nvidia-driver: nvidia_subr.c:835:46: error: too few arguments to function...
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Alexey Dokuchaev
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-09-09 21:40 UTC by O. Hartmann
Modified: 2013-09-12 08:20 UTC (History)
0 users

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description O. Hartmann 2013-09-09 21:40:00 UTC
[...]
--- nvidia_subr.o ---
nvidia_subr.c:835:46: error: too few arguments to function call, expected 10, have 9
            (VM_PROT_READ | VM_PROT_WRITE), 0);
                                             ^
@/vm/vm_map.h:368:1: note: 'vm_map_find' declared here
int vm_map_find(vm_map_t, vm_object_t, vm_ooffset_t, vm_offset_t *, vm_size_t,
^
1 error generated.
*** [nvidia_subr.o] Error code 1

make[3]: stopped in /usr/ports/x11/nvidia-driver/work/NVIDIA-FreeBSD-x86_64-325.15/src
1 error

make[3]: stopped in /usr/ports/x11/nvidia-driver/work/NVIDIA-FreeBSD-x86_64-325.15/src
*** [all] Error code 2

make[2]: stopped in /usr/ports/x11/nvidia-driver/work/NVIDIA-FreeBSD-x86_64-325.15
1 error
Comment 1 Edwin Groothuis freebsd_committer 2013-09-09 21:40:08 UTC
Responsible Changed
From-To: freebsd-ports-bugs->danfe

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 dfilter service freebsd_committer 2013-09-12 08:16:36 UTC
Author: danfe
Date: Thu Sep 12 07:16:29 2013
New Revision: 327039
URL: http://svnweb.freebsd.org/changeset/ports/327039

Log:
  - Unbreak on recent -CURRENT (after r255426): vm_map_find() now takes 10
    (ten) arguments rather than 9 (nine)
  - Adjust OSVERSION check of the previous patch, after properly bumped by
    pjd@ in r255305
  
  PR:	ports/181972

Modified:
  head/x11/nvidia-driver/Makefile

Modified: head/x11/nvidia-driver/Makefile
==============================================================================
--- head/x11/nvidia-driver/Makefile	Thu Sep 12 07:05:49 2013	(r327038)
+++ head/x11/nvidia-driver/Makefile	Thu Sep 12 07:16:29 2013	(r327039)
@@ -155,11 +155,16 @@ post-patch: .SILENT
 		${WRKSRC}/src/nvidia_subr.c
 .endif
 # Adopt to cap_rights_t type change in FreeBSD src SVN r255219
-.if ${OSVERSION} > 1000051
+.if ${OSVERSION} > 1000052
 	${REINPLACE_CMD} -e 's/u_long cmd;/& cap_rights_t rights;/ ; \
 		s/CAP_IOCTL/cap_rights_init(\&rights, &)/' \
 			${WRKSRC}/src/nvidia_linux.c
 .endif
+# Argument count of vm_map_find() changed in FreeBSD src SVN r255426
+.if ${OSVERSION} > 1000054
+	${REINPLACE_CMD} -e 's/virtual_address, size,/& 0,/' \
+		${WRKSRC}/src/nvidia_subr.c
+.endif
 # Fix stack buffer overflow in nvidia_sysctl_bus_type()
 .if ${NVVERSION} < 3192300
 	${REINPLACE_CMD} -E '/bus_type\[4\]/d ; \
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 Alexey Dokuchaev freebsd_committer 2013-09-12 08:16:46 UTC
State Changed
From-To: open->closed

Should be fixed as of r327039, thanks for the report!