x11/nvidia-driver build fails in head @r246115

2013-01-30 Thread David Wolfskill
I include

PORTS_MODULES=x11/nvidia-driver

in /etc/src.conf in order to keep nvidia-driver in sync with my kernel.

It last built OK yesterday, @r246057; @r246115, I see:

===   nvidia-driver-304.64 depends on file: 
/usr/local/libdata/pkgconfig/xorg-server.pc - found
===   nvidia-driver-304.64 depends on shared library: GL.1 - found
===  Configuring for nvidia-driver-304.64
===  Building for nvidia-driver-304.64
=== src (all)
@ - /usr/src/sys
machine - /usr/src/sys/i386/include
x86 - /usr/src/sys/x86/include
awk -f @/tools/makeobjops.awk @/kern/device_if.m -h
awk -f @/tools/makeobjops.awk @/kern/bus_if.m -h
awk -f @/tools/makeobjops.awk @/dev/pci/pci_if.m -h
awk -f @/tools/vnode_if.awk @/kern/vnode_if.src -p
awk -f @/tools/vnode_if.awk @/kern/vnode_if.src -q
awk -f @/tools/vnode_if.awk @/kern/vnode_if.src -h
clang -O2 -pipe -fno-strict-aliasing -DNV_VERSION_STRING=\304.64\ 
-D__KERNEL__ -DNVRM -Wno-unused-function -Wuninitialized -O -UDEBUG -U_DEBUG 
-DNDEBUG -Werror -D_KERNEL -DKLD_MODULE -nostdinc  -I. -I. -I@ -I@/contrib/altq 
-fno-common   -mno-aes -mno-avx -mno-mmx -mno-sse -msoft-float -ffreestanding 
-fstack-protector -std=iso9899:1999 -Qunused-arguments -fstack-protector -Wall 
-Wredundant-decls -Wnested-externs -Wstrict-prototypes  -Wmissing-prototypes 
-Wpointer-arith -Winline -Wcast-qual  -Wundef -Wno-pointer-sign 
-fformat-extensions  -Wmissing-include-dirs -fdiagnostics-show-option  
-Wno-error-tautological-compare -Wno-error-empty-body  
-Wno-error-parentheses-equality -c nvidia_ctl.c
clang -O2 -pipe -fno-strict-aliasing -DNV_VERSION_STRING=\304.64\ 
-D__KERNEL__ -DNVRM -Wno-unused-function -Wuninitialized -O -UDEBUG -U_DEBUG 
-DNDEBUG -Werror -D_KERNEL -DKLD_MODULE -nostdinc  -I. -I. -I@ -I@/contrib/altq 
-fno-common   -mno-aes -mno-avx -mno-mmx -mno-sse -msoft-float -ffreestanding 
-fstack-protector -std=iso9899:1999 -Qunused-arguments -fstack-protector -Wall 
-Wredundant-decls -Wnested-externs -Wstrict-prototypes  -Wmissing-prototypes 
-Wpointer-arith -Winline -Wcast-qual  -Wundef -Wno-pointer-sign 
-fformat-extensions  -Wmissing-include-dirs -fdiagnostics-show-option  
-Wno-error-tautological-compare -Wno-error-empty-body  
-Wno-error-parentheses-equality -c nvidia_dev.c
clang -O2 -pipe -fno-strict-aliasing -DNV_VERSION_STRING=\304.64\ 
-D__KERNEL__ -DNVRM -Wno-unused-function -Wuninitialized -O -UDEBUG -U_DEBUG 
-DNDEBUG -Werror -D_KERNEL -DKLD_MODULE -nostdinc  -I. -I. -I@ -I@/contrib/altq 
-fno-common   -mno-aes -mno-avx -mno-mmx -mno-sse -msoft-float -ffreestanding 
-fstack-protector -std=iso9899:1999 -Qunused-arguments -fstack-protector -Wall 
-Wredundant-decls -Wnested-externs -Wstrict-prototypes  -Wmissing-prototypes 
-Wpointer-arith -Winline -Wcast-qual  -Wundef -Wno-pointer-sign 
-fformat-extensions  -Wmissing-include-dirs -fdiagnostics-show-option  
-Wno-error-tautological-compare -Wno-error-empty-body  
-Wno-error-parentheses-equality -c nvidia_i2c.c
clang -O2 -pipe -fno-strict-aliasing -DNV_VERSION_STRING=\304.64\ 
-D__KERNEL__ -DNVRM -Wno-unused-function -Wuninitialized -O -UDEBUG -U_DEBUG 
-DNDEBUG -Werror -D_KERNEL -DKLD_MODULE -nostdinc  -I. -I. -I@ -I@/contrib/altq 
-fno-common   -mno-aes -mno-avx -mno-mmx -mno-sse -msoft-float -ffreestanding 
-fstack-protector -std=iso9899:1999 -Qunused-arguments -fstack-protector -Wall 
-Wredundant-decls -Wnested-externs -Wstrict-prototypes  -Wmissing-prototypes 
-Wpointer-arith -Winline -Wcast-qual  -Wundef -Wno-pointer-sign 
-fformat-extensions  -Wmissing-include-dirs -fdiagnostics-show-option  
-Wno-error-tautological-compare -Wno-error-empty-body  
-Wno-error-parentheses-equality -c nvidia_linux.c
nvidia_linux.c:51:28: error: variable has incomplete type 'struct 
linux_ioctl_handler'
struct linux_ioctl_handler nvidia_handler = {
   ^
nvidia_linux.c:51:8: note: forward declaration of 'struct linux_ioctl_handler'
struct linux_ioctl_handler nvidia_handler = {
   ^
nvidia_linux.c:62:5: error: implicit declaration of function 
'linux_ioctl_register_handler' is invalid in C99 
[-Werror,-Wimplicit-function-declaration]
linux_ioctl_register_handler(nvidia_handler);
^
nvidia_linux.c:69:5: error: implicit declaration of function 
'linux_ioctl_unregister_handler' is invalid in C99 
[-Werror,-Wimplicit-function-declaration]
linux_ioctl_unregister_handler(nvidia_handler);
^
nvidia_linux.c:69:5: note: did you mean 'linux_ioctl_register_handler'?
linux_ioctl_unregister_handler(nvidia_handler);
^~
linux_ioctl_register_handler
nvidia_linux.c:62:5: note: 'linux_ioctl_register_handler' declared here
linux_ioctl_register_handler(nvidia_handler);
^
3 errors generated.
*** [nvidia_linux.o] Error code 1

Stop in 
/common/S4/obj/usr/src/sys/CANARY/common/ports/x11/nvidia-driver/work/NVIDIA-FreeBSD-x86-304.64/src.
*** [all] Error code 1

Stop in 
/common/S4/obj/usr/src/sys/CANARY/common/ports/x11/nvidia-driver/work/NVIDIA-FreeBSD-x86-304.64.
*** [do-build] Error 

Re: x11/nvidia-driver build fails in head @r246115

2013-01-30 Thread John Baldwin
On Wednesday, January 30, 2013 9:51:35 am David Wolfskill wrote:
 I include
 
 PORTS_MODULES=x11/nvidia-driver
 
 in /etc/src.conf in order to keep nvidia-driver in sync with my kernel.
 
 It last built OK yesterday, @r246057; @r246115, I see:

Oof, it needs to use compat/linux/linux_ioctl.h instead of one of the 
foo/linux.h headers on HEAD.  (and this is my fault)

Alexey, can you patch the port for that?

-- 
John Baldwin
___
freebsd-current@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-current
To unsubscribe, send any mail to freebsd-current-unsubscr...@freebsd.org