hello

I had a problem building X11 from build.sh (rnetbsd-2-0) with X11DRI set.
This is the conflicting code

#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
static irqreturn_t
DRM(irq_handler_wrap)(DRM_IRQ_ARGS)
{
        drm_device_t *dev = (drm_device_t *)arg;
 
        DRM_SPINLOCK(&dev->irq_lock);
        DRM(irq_handler)(arg);
        DRM_SPINUNLOCK(&dev->irq_lock);
}
#endif

Please someone let me know if I am doing something wrong.

Cesar

This is the output:

    compile  mga/mga_warp.o
    compile  mga/mga_drv.o
In file included from /usr/xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga_drv.c:48:
/usr/xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_irq.h: In function `mga_irq_install':
/usr/xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_irq.h:92: error: structure has no member named `irq_lock'

*** Failed target:  mga_drv.o
*** Failed command: /home/cetrox/src/src/obj/tooldir.NetBSD-2.0_BETA-i386/bin/i386--netbsdelf-gcc -O2 -ffreestanding -Werror -I/usr/xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel -I/usr/xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/shared/drm/kernel -nostdinc -I. -I/home/cetrox/src/src/x11/Xserver/hw/xfree86/drm/mga -isystem /home/cetrox/src/src/sys -isystem /home/cetrox/src/src/sys/arch -D_KERNEL -D_LKM -c /usr/xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga_drv.c
*** Error code 1

Stop.
nbmake: stopped in /home/cetrox/src/src/x11/Xserver/hw/xfree86/drm/mga

*** Failed target:  dependall
*** Failed command: cd /home/cetrox/src/src/x11/Xserver/hw/xfree86/drm/mga; /home/cetrox/src/src/obj/tooldir.NetBSD-2.0_BETA-i386/bin/nbmake realall
*** Error code 1

Stop.
nbmake: stopped in /home/cetrox/src/src/x11/Xserver/hw/xfree86/drm/mga

*** Failed target:  dependall-mga
*** Failed command: targ=dependall;dir=mga; case "$dir" in /*) echo "$targ ===> $dir"; cd "$dir"; /home/cetrox/src/src/obj/tooldir.NetBSD-2.0_BETA-i386/bin/nbmake "_THISDIR_=$dir/" $targ; ;; *) echo "$targ ===> Xserver/hw/xfree86/drm/$dir"; cd "/home/cetrox/src/src/x11/Xserver/hw/xfree86/drm/$dir"; /home/cetrox/src/src/obj/tooldir.NetBSD-2.0_BETA-i386/bin/nbmake "_THISDIR_=Xserver/hw/xfree86/drm/$dir/" $targ; ;; esac
*** Error code 1

Stop.
nbmake: stopped in /home/cetrox/src/src/x11/Xserver/hw/xfree86/drm

*** Failed target:  dependall-drm
*** Failed command: targ=dependall;dir=drm; case "$dir" in /*) echo "$targ ===> $dir"; cd "$dir"; /home/cetrox/src/src/obj/tooldir.NetBSD-2.0_BETA-i386/bin/nbmake "_THISDIR_=$dir/" $targ; ;; *) echo "$targ ===> Xserver/hw/xfree86/$dir"; cd "/home/cetrox/src/src/x11/Xserver/hw/xfree86/$dir"; /home/cetrox/src/src/obj/tooldir.NetBSD-2.0_BETA-i386/bin/nbmake "_THISDIR_=Xserver/hw/xfree86/$dir/" $targ; ;; esac
*** Error code 1
      
Stop. 
nbmake: stopped in /home/cetrox/src/src/x11/Xserver/hw/xfree86
      
*** Failed target:  dependall-xfree86
*** Failed command: targ=dependall;dir=xfree86; case "$dir" in /*) echo "$targ ===> $dir"; cd "$dir"; /home/cetrox/src/src/obj/tooldir.NetBSD-2.0_BETA-i386/bin/nbmake "_THISDIR_=$dir/" $targ; ;; *) echo "$targ ===> Xserver/hw/$dir"; cd "/home/cetrox/src/src/x11/Xserver/hw/$dir"; /home/cetrox/src/src/obj/tooldir.NetBSD-2.0_BETA-i386/bin/nbmake "_THISDIR_=Xserver/hw/$dir/" $targ; ;; esac
*** Error code 1
      
Stop. 
nbmake: stopped in /home/cetrox/src/src/x11/Xserver/hw
      
*** Failed target:  dependall-hw
*** Failed command: targ=dependall;dir=hw; case "$dir" in /*) echo "$targ ===> $dir"; cd "$dir"; /home/cetrox/src/src/obj/tooldir.NetBSD-2.0_BETA-i386/bin/nbmake "_THISDIR_=$dir/" $targ; ;; *) echo "$targ ===> Xserver/$dir"; cd "/home/cetrox/src/src/x11/Xserver/$dir"; /home/cetrox/src/src/obj/tooldir.NetBSD-2.0_BETA-i386/bin/nbmake "_THISDIR_=Xserver/$dir/" $targ; ;; esac
*** Error code 1
      
Stop. 
nbmake: stopped in /home/cetrox/src/src/x11/Xserver
      
*** Failed target:  dependall-Xserver
*** Failed command: targ=dependall;dir=Xserver; case "$dir" in /*) echo "$targ ===> $dir"; cd "$dir"; /home/cetrox/src/src/obj/tooldir.NetBSD-2.0_BETA-i386/bin/nbmake "_THISDIR_=$dir/" $targ; ;; *) echo "$targ ===> $dir"; cd "/home/cetrox/src/src/x11/$dir"; /home/cetrox/src/src/obj/tooldir.NetBSD-2.0_BETA-i386/bin/nbmake "_THISDIR_=$dir/" $targ; ;; esac
*** Error code 1
      
Stop. 
nbmake: stopped in /home/cetrox/src/src/x11
      
*** Failed target:  do-build
*** Failed command: (cd /home/cetrox/src/src/x11 && /home/cetrox/src/src/obj/tooldir.NetBSD-2.0_BETA-i386/bin/nbmake dependall)
*** Error code 1
      
Stop. 
nbmake: stopped in /home/cetrox/src/src/x11
      
*** Failed target:  build
*** Failed command: (cd /home/cetrox/src/src/x11 && /home/cetrox/src/src/obj/tooldir.NetBSD-2.0_BETA-i386/bin/nbmake do-build)
*** Error code 1
      
Stop. 
nbmake: stopped in /home/cetrox/src/src/x11
      
*** Failed target:  do-x11
*** Failed command: (cd /home/cetrox/src/src/x11 && /home/cetrox/src/src/obj/tooldir.NetBSD-2.0_BETA-i386/bin/nbmake build)
*** Error code 1
      
Stop. 
nbmake: stopped in /home/cetrox/src/src
      
*** Failed target:  build
*** Failed command: (cd /home/cetrox/src/src && /home/cetrox/src/src/obj/tooldir.NetBSD-2.0_BETA-i386/bin/nbmake do-x11)
*** Error code 1
      
Stop. 
nbmake: stopped in /home/cetrox/src/src
      
ERROR: Failed to make build
*** BUILD ABORTED ***