Sun Dec 21 19:05:22 2014 UTC ()
Apply patch (requested by mrg in ticket 1208):
Pass -Wno-error to work around a build failure on vax with gcc 4.1


(snj)
diff -r1.4 -r1.4.10.1 src/external/mit/xorg/server/xorg-server/Xi/Makefile
cvs diff -r1.4 -r1.4.10.1 src/external/mit/xorg/server/xorg-server/Xi/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/server/xorg-server/Xi/Makefile 2011/08/11 23:15:41 1.4
+++ src/external/mit/xorg/server/xorg-server/Xi/Makefile 2014/12/21 19:05:22 1.4.10.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.4 2011/08/11 23:15:41 joerg Exp $ 1# $NetBSD: Makefile,v 1.4.10.1 2014/12/21 19:05:22 snj Exp $
2 2
3.include "../Makefile.serverlib" 3.include "../Makefile.serverlib"
4.include "../Makefile.servermod" 4.include "../Makefile.servermod"
5 5
6LIB= Xi 6LIB= Xi
7 7
8.PATH: ${X11SRCDIR.xorg-server}/${LIB} 8.PATH: ${X11SRCDIR.xorg-server}/${LIB}
9 9
10SRCS= allowev.c chgdctl.c chgfctl.c chgkbd.c chgkmap.c chgprop.c \ 10SRCS= allowev.c chgdctl.c chgfctl.c chgkbd.c chgkmap.c chgprop.c \
11 chgptr.c closedev.c devbell.c exevents.c extinit.c \ 11 chgptr.c closedev.c devbell.c exevents.c extinit.c \
12 getbmap.c getdctl.c getfctl.c getfocus.c getkmap.c \ 12 getbmap.c getdctl.c getfctl.c getfocus.c getkmap.c \
13 getmmap.c getprop.c getselev.c getvers.c grabdev.c \ 13 getmmap.c getprop.c getselev.c getvers.c grabdev.c \
14 grabdevb.c grabdevk.c gtmotion.c listdev.c opendev.c \ 14 grabdevb.c grabdevk.c gtmotion.c listdev.c opendev.c \
@@ -28,15 +28,18 @@ SRCS= allowev.c chgdctl.c chgfctl.c chg @@ -28,15 +28,18 @@ SRCS= allowev.c chgdctl.c chgfctl.c chg
28 xiselectev.c \ 28 xiselectev.c \
29 xisetclientpointer.c \ 29 xisetclientpointer.c \
30 xisetdevfocus.c \ 30 xisetdevfocus.c \
31 xiwarppointer.c 31 xiwarppointer.c
32 32
33CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/pixman-1 \ 33CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/pixman-1 \
34 -I${DESTDIR}${X11INCDIR}/xorg \ 34 -I${DESTDIR}${X11INCDIR}/xorg \
35 -I${X11SRCDIR.xorg-server}/Xext \ 35 -I${X11SRCDIR.xorg-server}/Xext \
36 -I${X11SRCDIR.xorg-server}/../include 36 -I${X11SRCDIR.xorg-server}/../include
37CPPFLAGS+= ${X11FLAGS.DIX} 37CPPFLAGS+= ${X11FLAGS.DIX}
38 38
39CWARNFLAGS.clang+= -Wno-tautological-compare 39CWARNFLAGS.clang+= -Wno-tautological-compare
40 40
 41# XXX: uint16 vs INT_MAX
 42COPTS.xichangehierarchy.c+= -Wno-error
 43
41.include <bsd.x11.mk> 44.include <bsd.x11.mk>
42.include <bsd.lib.mk> 45.include <bsd.lib.mk>