From c4db8cc4bde6fc4de46881506c427a9dbdf65bfd Mon Sep 17 00:00:00 2001
From: tron <tron@NetBSD.org>
Date: Mon, 6 Oct 2008 16:24:33 +0000
Subject: [PATCH] Fix the build if stack protection is enabled.

---
 external/mit/xorg/lib/dri/dri.mk            | 4 +++-
 external/mit/xorg/lib/libX11/Makefile.ximcp | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/external/mit/xorg/lib/dri/dri.mk b/external/mit/xorg/lib/dri/dri.mk
index 119499874d57..465370982c3d 100644
--- a/external/mit/xorg/lib/dri/dri.mk
+++ b/external/mit/xorg/lib/dri/dri.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dri.mk,v 1.2 2008/09/21 14:08:45 lukem Exp $
+# $NetBSD: dri.mk,v 1.3 2008/10/06 16:24:33 tron Exp $
 
 # XXX DRI_LIB_DEPS
 
@@ -22,6 +22,8 @@ CPPFLAGS+=	-D_NETBSD_SOURCE -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 \
 		-DIN_DRI_DRIVER -DGLX_DIRECT_RENDERING \
 		-DGLX_INDIRECT_RENDERING -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN
 
+CPPFLAGS+=	-Wno-stack-protector
+
 .PATH: ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/${MODULE} ${DRI_EXTRA_PATHS}
 
 # Common sources
diff --git a/external/mit/xorg/lib/libX11/Makefile.ximcp b/external/mit/xorg/lib/libX11/Makefile.ximcp
index ea64bf9d97d4..30f8e499d1ec 100644
--- a/external/mit/xorg/lib/libX11/Makefile.ximcp
+++ b/external/mit/xorg/lib/libX11/Makefile.ximcp
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.ximcp,v 1.1 2008/09/07 13:15:11 rtr Exp $
+# $NetBSD: Makefile.ximcp,v 1.2 2008/10/06 16:24:33 tron Exp $
 
 .PATH:	${X11SRCDIR.X11}/modules/im/ximcp
 SRCS.ximcp= \
@@ -42,5 +42,6 @@ CPPFLAGS+= \
 CPPFLAGS.imDefLkup.c=	-Wno-error
 CPPFLAGS.imRm.c=	-Wno-error
 CPPFLAGS.imTrans.c=	-Wno-error
+CPPFLAGS.imLcLkup.c=	-Wno-stack-protector
 
 .include <bsd.lib.mk>