Wed Jun 12 04:05:36 2013 UTC ()
Pull up following revision(s) (requested by mrg in ticket #901):
	external/mit/xorg/lib/libX11/Makefile.libx11: revision 1.11
hack for old gcc.


(msaitoh)
diff -r1.8 -r1.8.10.1 src/external/mit/xorg/lib/libX11/Makefile.libx11
cvs diff -r1.8 -r1.8.10.1 src/external/mit/xorg/lib/libX11/Makefile.libx11 (expand / switch to unified diff)

--- src/external/mit/xorg/lib/libX11/Makefile.libx11 2011/02/23 07:53:29 1.8
+++ src/external/mit/xorg/lib/libX11/Makefile.libx11 2013/06/12 04:05:36 1.8.10.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.libx11,v 1.8 2011/02/23 07:53:29 mrg Exp $ 1# $NetBSD: Makefile.libx11,v 1.8.10.1 2013/06/12 04:05:36 msaitoh Exp $
2 2
3LIB= X11 3LIB= X11
4.PATH: ${X11SRCDIR.${LIB}}/src 4.PATH: ${X11SRCDIR.${LIB}}/src
5.PATH: ${X11SRCDIR.${LIB}}/src/xkb 5.PATH: ${X11SRCDIR.${LIB}}/src/xkb
6.PATH: ${X11SRCDIR.${LIB}}/src/xcms 6.PATH: ${X11SRCDIR.${LIB}}/src/xcms
7.PATH: ${X11SRCDIR.${LIB}}/src/xlibi18n 7.PATH: ${X11SRCDIR.${LIB}}/src/xlibi18n
8 8
9SRCS= \ 9SRCS= \
10 AllCells.c \ 10 AllCells.c \
11 AllowEv.c \ 11 AllowEv.c \
12 AllPlanes.c \ 12 AllPlanes.c \
13 AutoRep.c \ 13 AutoRep.c \
14 Backgnd.c \ 14 Backgnd.c \
@@ -451,15 +451,19 @@ CPPFLAGS.imTrans.c= $(CONN_DEFINES) $(XT @@ -451,15 +451,19 @@ CPPFLAGS.imTrans.c= $(CONN_DEFINES) $(XT
451CPPFLAGS.imTransR.c= $(CONN_DEFINES) $(XTRANS_XIM_DEFINES) 451CPPFLAGS.imTransR.c= $(CONN_DEFINES) $(XTRANS_XIM_DEFINES)
452CPPFLAGS.lcFile.c= $(XLC_DEFINES) $(SETID_DEFINES) 452CPPFLAGS.lcFile.c= $(XLC_DEFINES) $(SETID_DEFINES)
453CPPFLAGS.x11trans.c= $(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES) $(XTRANS_X_DEFINES) $(POLL_DEFINES) 453CPPFLAGS.x11trans.c= $(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES) $(XTRANS_X_DEFINES) $(POLL_DEFINES)
454CPPFLAGS.ximtrans.c= $(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES) $(XTRANS_XIM_DEFINES) $(POLL_DEFINES) 454CPPFLAGS.ximtrans.c= $(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES) $(XTRANS_XIM_DEFINES) $(POLL_DEFINES)
455 455
456#BUILDSYMLINKS= transport.c x11trans.c \ 456#BUILDSYMLINKS= transport.c x11trans.c \
457# transport.c ximtrans.c 457# transport.c ximtrans.c
458 458
459COPTS.StBytes.c+= -Wno-error 459COPTS.StBytes.c+= -Wno-error
460COPTS.lcUTF8.c+= -Wno-error 460COPTS.lcUTF8.c+= -Wno-error
461COPTS.Font.c+= -Wno-error # XXX xf86bigfstr.h 461COPTS.Font.c+= -Wno-error # XXX xf86bigfstr.h
462COPTS.OpenDis.c+= -Wno-error # XXX xf86bigfstr.h 462COPTS.OpenDis.c+= -Wno-error # XXX xf86bigfstr.h
463COPTS.XlibInt.c+= -Wno-error # XXX xcmiscstr.h 463COPTS.XlibInt.c+= -Wno-error # XXX xcmiscstr.h
 464.if ${HAVE_GCC} < 45
 465COPTS.LiHosts.c+= -Wno-error # XXX: old gcc figures out that const
 466 # cond because nHosts < max_hosts
 467.endif
464 468
465.include "${NETBSDSRCDIR}/external/mit/xorg/tools/makekeys/Makefile.makekeys" 469.include "${NETBSDSRCDIR}/external/mit/xorg/tools/makekeys/Makefile.makekeys"