Sat Jul 30 11:18:23 2011 UTC ()
Fix build with SSP enabled.


(tron)
diff -r1.7 -r1.8 src/external/mit/xorg/bin/xkbcomp/Makefile
cvs diff -r1.7 -r1.8 src/external/mit/xorg/bin/xkbcomp/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/bin/xkbcomp/Makefile 2011/02/21 04:54:52 1.7
+++ src/external/mit/xorg/bin/xkbcomp/Makefile 2011/07/30 11:18:23 1.8
@@ -1,28 +1,29 @@ @@ -1,28 +1,29 @@
1# $NetBSD: Makefile,v 1.7 2011/02/21 04:54:52 mrg Exp $ 1# $NetBSD: Makefile,v 1.8 2011/07/30 11:18:23 tron Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4.include "Makefile.common" 4.include "Makefile.common"
5 5
6PROG= xkbcomp 6PROG= xkbcomp
7SRCS= xkbcomp.c xkbscan.c expr.c vmod.c indicators.c misc.c \ 7SRCS= xkbcomp.c xkbscan.c expr.c vmod.c indicators.c misc.c \
8 keymap.c keycodes.c keytypes.c compat.c action.c alias.c \ 8 keymap.c keycodes.c keytypes.c compat.c action.c alias.c \
9 symbols.c geometry.c xkbpath.c listing.c \ 9 symbols.c geometry.c xkbpath.c listing.c \
10 xkbparse.y parseutils.c utils.c 10 xkbparse.y parseutils.c utils.c
11 11
12CPPFLAGS.xkbpath.c= -DDFLT_XKB_CONFIG_ROOT=\"${XKBROOTDIR}\" 12CPPFLAGS.xkbpath.c= -DDFLT_XKB_CONFIG_ROOT=\"${XKBROOTDIR}\"
13 13
14CPPFLAGS+= -I${X11SRCDIR.${PROG}} -I${X11SRCDIR.${PROG}}/../include -DHAVE_CONFIG_H 14CPPFLAGS+= -I${X11SRCDIR.${PROG}} -I${X11SRCDIR.${PROG}}/../include -DHAVE_CONFIG_H
15CPPFLAGS.geometry.c= -Wno-error # XXX 15CPPFLAGS.geometry.c= -Wno-error # XXX
 16COPTS.xkbscan.c+= -Wno-stack-protector
16 17
17FILESDIR=${XKBROOTDIR} 18FILESDIR=${XKBROOTDIR}
18FILES= README 19FILES= README
19 20
20SYMLINKS+= ${BINDIR}/xkbcomp ${XKBROOTDIR}/xkbcomp 21SYMLINKS+= ${BINDIR}/xkbcomp ${XKBROOTDIR}/xkbcomp
21SYMLINKS+= ${XKBDATADIR} ${XKBCOMPDIR} 22SYMLINKS+= ${XKBDATADIR} ${XKBCOMPDIR}
22 23
23LDADD+= -lxkbfile -lXext -lX11 24LDADD+= -lxkbfile -lXext -lX11
24DPADD+= ${LIBXKBFILE} ${LIBXEXT} ${LIBX11} 25DPADD+= ${LIBXKBFILE} ${LIBXEXT} ${LIBX11}
25 26
26.PATH: ${X11SRCDIR.${PROG}} 27.PATH: ${X11SRCDIR.${PROG}}
27.PATH: ${X11SRCDIR.${PROG}}/man 28.PATH: ${X11SRCDIR.${PROG}}/man
28 29