Wed Apr 4 10:59:48 2012 UTC ()
Disable new -Wstring-plus-int warning where needed for now.
Adjust various places that add GCC-only options to check for the active
compiler first.


(joerg)
diff -r1.10 -r1.11 src/bin/stty/Makefile
diff -r1.1 -r1.2 src/external/bsd/cron/bin/cron/Makefile
diff -r1.10 -r1.11 src/external/gpl2/xcvs/lib/libcvs/Makefile
diff -r1.1 -r1.2 src/external/gpl2/xcvs/lib/libdiff/Makefile
diff -r1.4 -r1.5 src/external/gpl3/gdb/Makefile.inc
diff -r1.2 -r1.3 src/external/mit/xorg/lib/libFS/Makefile
diff -r1.2 -r1.3 src/external/mit/xorg/lib/libICE/Makefile
diff -r1.8 -r1.9 src/external/mit/xorg/lib/libX11/Makefile.libx11
diff -r1.8 -r1.9 src/external/mit/xorg/lib/libXfont/Makefile
diff -r1.3 -r1.4 src/gnu/usr.bin/diffutils/diff/Makefile
diff -r1.23 -r1.24 src/gnu/usr.bin/rcs/lib/Makefile
diff -r1.7 -r1.8 src/gnu/usr.bin/rcs/rlog/Makefile
diff -r1.122 -r1.123 src/lib/libm/Makefile
diff -r1.75 -r1.76 src/lib/libpthread/Makefile
diff -r1.5 -r1.6 src/regress/sys/kern/ras/ras1/Makefile
diff -r1.5 -r1.6 src/regress/sys/kern/ras/ras2/Makefile
diff -r1.5 -r1.6 src/regress/sys/kern/ras/ras3/Makefile
diff -r1.105 -r1.106 src/share/mk/bsd.x11.mk
diff -r1.4 -r1.5 src/tests/lib/libc/ssp/Makefile
cvs diff -r1.10 -r1.11 src/bin/stty/Makefile (expand / switch to unified diff)

--- src/bin/stty/Makefile 1997/07/20 22:38:04 1.10
+++ src/bin/stty/Makefile 2012/04/04 10:59:44 1.11
@@ -1,7 +1,9 @@ @@ -1,7 +1,9 @@
1# $NetBSD: Makefile,v 1.10 1997/07/20 22:38:04 christos Exp $ 1# $NetBSD: Makefile,v 1.11 2012/04/04 10:59:44 joerg Exp $
2# @(#)Makefile 8.1 (Berkeley) 5/31/93 2# @(#)Makefile 8.1 (Berkeley) 5/31/93
3 3
4PROG= stty 4PROG= stty
5SRCS= cchar.c gfmt.c key.c modes.c print.c stty.c 5SRCS= cchar.c gfmt.c key.c modes.c print.c stty.c
6 6
 7CWARNFLAGS.clang+= -Wno-string-plus-int
 8
7.include <bsd.prog.mk> 9.include <bsd.prog.mk>
cvs diff -r1.1 -r1.2 src/external/bsd/cron/bin/cron/Makefile (expand / switch to unified diff)

--- src/external/bsd/cron/bin/cron/Makefile 2010/05/06 18:58:45 1.1
+++ src/external/bsd/cron/bin/cron/Makefile 2012/04/04 10:59:44 1.2
@@ -1,11 +1,13 @@ @@ -1,11 +1,13 @@
1# $NetBSD: Makefile,v 1.1 2010/05/06 18:58:45 christos Exp $ 1# $NetBSD: Makefile,v 1.2 2012/04/04 10:59:44 joerg Exp $
2 2
3BINDIR= /usr/sbin 3BINDIR= /usr/sbin
4PROG= cron 4PROG= cron
5SRCS= cron.c database.c do_command.c entry.c env.c job.c \ 5SRCS= cron.c database.c do_command.c entry.c env.c job.c \
6 misc.c popen.c pw_dup.c user.c 6 misc.c popen.c pw_dup.c user.c
7CPPFLAGS+=-I${.CURDIR} -DLOGIN_CAP 7CPPFLAGS+=-I${.CURDIR} -DLOGIN_CAP
8LDADD+=-lutil 8LDADD+=-lutil
9MAN= cron.8 9MAN= cron.8
10 10
 11CWARNFLAGS+= -Wno-string-plus-int
 12
11.include <bsd.prog.mk> 13.include <bsd.prog.mk>
cvs diff -r1.10 -r1.11 src/external/gpl2/xcvs/lib/libcvs/Makefile (expand / switch to unified diff)

--- src/external/gpl2/xcvs/lib/libcvs/Makefile 2010/12/30 00:46:38 1.10
+++ src/external/gpl2/xcvs/lib/libcvs/Makefile 2012/04/04 10:59:44 1.11
@@ -1,25 +1,27 @@ @@ -1,25 +1,27 @@
1# $NetBSD: Makefile,v 1.10 2010/12/30 00:46:38 pgoyette Exp $ 1# $NetBSD: Makefile,v 1.11 2012/04/04 10:59:44 joerg Exp $
2 2
3LIBISPRIVATE= yes 3LIBISPRIVATE= yes
4 4
5.include "${.CURDIR}/../../Makefile.inc" 5.include "${.CURDIR}/../../Makefile.inc"
6 6
7LIB= cvs 7LIB= cvs
8 8
9DIST= ${IDIST}/lib 9DIST= ${IDIST}/lib
10.PATH: ${DIST} 10.PATH: ${DIST}
11CPPFLAGS+=-I${DIST} 11CPPFLAGS+=-I${DIST}
12 12
13SRCS= __fpending.c asnprintf.c basename.c canon-host.c canonicalize.c \ 13SRCS= __fpending.c asnprintf.c basename.c canon-host.c canonicalize.c \
14 chdir-long.c closeout.c cycle-check.c dirname.c dup-safer.c exitfail.c \ 14 chdir-long.c closeout.c cycle-check.c dirname.c dup-safer.c exitfail.c \
15 fd-safer.c getdate.c gettime.c md5.c \ 15 fd-safer.c getdate.c gettime.c md5.c \
16 openat.c pagealign_alloc.c printf-args.c printf-parse.c \ 16 openat.c pagealign_alloc.c printf-args.c printf-parse.c \
17 quotearg.c regex.c rpmatch.c save-cwd.c sighandle.c strftime.c \ 17 quotearg.c regex.c rpmatch.c save-cwd.c sighandle.c strftime.c \
18 stripslash.c vasnprintf.c xalloc-die.c xgetcwd.c xgethostname.c \ 18 stripslash.c vasnprintf.c xalloc-die.c xgetcwd.c xgethostname.c \
19 xmalloc.c xreadlink.c yesno.c 19 xmalloc.c xreadlink.c yesno.c
20 20
 21CWARNFLAGS.clang+= -Wno-string-plus-int
 22
21.include <bsd.lib.mk> 23.include <bsd.lib.mk>
22# bsd.lib.mk includes bsd.sys.mk which defines the suffix rules, so we 24# bsd.lib.mk includes bsd.sys.mk which defines the suffix rules, so we
23# need to override after. 25# need to override after.
24.y.c .y.h: 26.y.c .y.h:
25 @true 27 @true
cvs diff -r1.1 -r1.2 src/external/gpl2/xcvs/lib/libdiff/Makefile (expand / switch to unified diff)

--- src/external/gpl2/xcvs/lib/libdiff/Makefile 2009/04/08 16:27:52 1.1
+++ src/external/gpl2/xcvs/lib/libdiff/Makefile 2012/04/04 10:59:44 1.2
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1# $NetBSD: Makefile,v 1.1 2009/04/08 16:27:52 christos Exp $ 1# $NetBSD: Makefile,v 1.2 2012/04/04 10:59:44 joerg Exp $
2 2
3LIBISPRIVATE= yes 3LIBISPRIVATE= yes
4 4
5.include "${.CURDIR}/../../Makefile.inc" 5.include "${.CURDIR}/../../Makefile.inc"
6 6
7LIB= diff 7LIB= diff
8 8
9DIST= ${IDIST}/${LIB} 9DIST= ${IDIST}/${LIB}
10.PATH: ${DIST} 10.PATH: ${DIST}
11 11
12SRCS != (cd ${DIST} && echo *.c) 12SRCS != (cd ${DIST} && echo *.c)
13 13
 14CWARNFLAGS.clang+= -Wno-string-plus-int
 15
14.include <bsd.lib.mk> 16.include <bsd.lib.mk>
cvs diff -r1.4 -r1.5 src/external/gpl3/gdb/Makefile.inc (expand / switch to unified diff)

--- src/external/gpl3/gdb/Makefile.inc 2012/02/05 17:47:30 1.4
+++ src/external/gpl3/gdb/Makefile.inc 2012/04/04 10:59:45 1.5
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile.inc,v 1.4 2012/02/05 17:47:30 matt Exp $ 1# $NetBSD: Makefile.inc,v 1.5 2012/04/04 10:59:45 joerg Exp $
2 2
3USE_LIBEDIT=no 3USE_LIBEDIT=no
4USE_TUI=yes 4USE_TUI=yes
5BINDIR=/usr/bin 5BINDIR=/usr/bin
6WARNS?= 0 6WARNS?= 0
7 7
8CWARNFLAGS.clang+= -Wno-unused-value -Wno-conversion \ 8CWARNFLAGS.clang+= -Wno-unused-value -Wno-conversion \
9 -Wno-switch-enum -Wno-parentheses -Wno-comment \ 9 -Wno-switch-enum -Wno-parentheses -Wno-comment \
10 -Wno-format-security \ 10 -Wno-format-security \
11 -Wno-tautological-compare -Wno-format-extra-args 11 -Wno-tautological-compare -Wno-format-extra-args \
 12 -Wno-string-plus-int
12 13
13.if ${MACHINE} == "vax" 14.if ${MACHINE} == "vax"
14CWARNFLAGS.gcc+= -Wno-overflow 15CWARNFLAGS.gcc+= -Wno-overflow
15.endif 16.endif
16 17
17DIST= ${NETBSDSRCDIR}/external/gpl3/gdb/dist 18DIST= ${NETBSDSRCDIR}/external/gpl3/gdb/dist
cvs diff -r1.2 -r1.3 src/external/mit/xorg/lib/libFS/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/lib/libFS/Makefile 2008/09/13 04:32:29 1.2
+++ src/external/mit/xorg/lib/libFS/Makefile 2012/04/04 10:59:45 1.3
@@ -1,27 +1,29 @@ @@ -1,27 +1,29 @@
1# $NetBSD: Makefile,v 1.2 2008/09/13 04:32:29 cube Exp $ 1# $NetBSD: Makefile,v 1.3 2012/04/04 10:59:45 joerg Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5LIB= FS 5LIB= FS
6.PATH: ${X11SRCDIR.${LIB}}/src 6.PATH: ${X11SRCDIR.${LIB}}/src
7.PATH: ${X11SRCDIR.${LIB}}/include/X11/fonts 7.PATH: ${X11SRCDIR.${LIB}}/include/X11/fonts
8 8
9SRCS= FSCloseFt.c FSClServ.c FSConnServ.c FSErrDis.c FSErrHndlr.c FSFlush.c \ 9SRCS= FSCloseFt.c FSClServ.c FSConnServ.c FSErrDis.c FSErrHndlr.c FSFlush.c \
10 FSFontInfo.c FSFtNames.c FSGetCats.c FSlibInt.c FSListCats.c \ 10 FSFontInfo.c FSFtNames.c FSGetCats.c FSlibInt.c FSListCats.c \
11 FSListExt.c FSMisc.c FSNextEv.c FSOpenFont.c FSOpenServ.c FSQGlyphs.c \ 11 FSListExt.c FSMisc.c FSNextEv.c FSOpenFont.c FSOpenServ.c FSQGlyphs.c \
12 FSQuExt.c FSQXExt.c FSQXInfo.c FSServName.c FSSetCats.c FSSync.c \ 12 FSQuExt.c FSQXExt.c FSQXInfo.c FSServName.c FSSetCats.c FSSync.c \
13 FSSynchro.c fs_transport.c 13 FSSynchro.c fs_transport.c
14 14
 15CWARNFLAGS.clang+= -Wno-string-plus-int
 16
15INCS= FSlib.h 17INCS= FSlib.h
16INCSDIR=${X11INCDIR}/X11/fonts 18INCSDIR=${X11INCDIR}/X11/fonts
17 19
18CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/fonts 20CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/fonts
19CPPFLAGS+= -I${X11SRCDIR.${LIB}}/../include 21CPPFLAGS+= -I${X11SRCDIR.${LIB}}/../include
20 22
21CONN_DEFINES = ${X11FLAGS.CONNECTION} -DFS_t -DTRANS_CLIENT 23CONN_DEFINES = ${X11FLAGS.CONNECTION} -DFS_t -DTRANS_CLIENT
22SOCK_DEFINES = -DBSD44SOCKETS 24SOCK_DEFINES = -DBSD44SOCKETS
23 25
24CPPFLAGS+= $(CONN_DEFINES) $(SOCK_DEFINES) 26CPPFLAGS+= $(CONN_DEFINES) $(SOCK_DEFINES)
25 27
26# XXX 28# XXX
27COPTS.FSGetCats.c+= -Wno-error 29COPTS.FSGetCats.c+= -Wno-error
cvs diff -r1.2 -r1.3 src/external/mit/xorg/lib/libICE/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/lib/libICE/Makefile 2008/09/13 04:32:30 1.2
+++ src/external/mit/xorg/lib/libICE/Makefile 2012/04/04 10:59:45 1.3
@@ -1,24 +1,26 @@ @@ -1,24 +1,26 @@
1# $NetBSD: Makefile,v 1.2 2008/09/13 04:32:30 cube Exp $ 1# $NetBSD: Makefile,v 1.3 2012/04/04 10:59:45 joerg Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5LIB= ICE 5LIB= ICE
6.PATH: ${X11SRCDIR.${LIB}}/src 6.PATH: ${X11SRCDIR.${LIB}}/src
7.PATH: ${X11SRCDIR.${LIB}}/include/X11/ICE 7.PATH: ${X11SRCDIR.${LIB}}/include/X11/ICE
8 8
9SRCS= accept.c authutil.c connect.c error.c getauth.c iceauth.c icetrans.c \ 9SRCS= accept.c authutil.c connect.c error.c getauth.c iceauth.c icetrans.c \
10 listen.c listenwk.c locking.c misc.c ping.c process.c protosetup.c \ 10 listen.c listenwk.c locking.c misc.c ping.c process.c protosetup.c \
11 register.c replywait.c setauth.c shutdown.c watch.c 11 register.c replywait.c setauth.c shutdown.c watch.c
12 12
13INCS= ICE.h ICEconn.h ICElib.h ICEmsg.h ICEproto.h ICEutil.h 13INCS= ICE.h ICEconn.h ICElib.h ICEmsg.h ICEproto.h ICEutil.h
14INCSDIR=${X11INCDIR}/X11/ICE 14INCSDIR=${X11INCDIR}/X11/ICE
15 15
16CONN_DEFINES= ${X11FLAGS.CONNECTION} -DICE_t=1 -DTRANS_CLIENT -DTRANS_SERVER 16CONN_DEFINES= ${X11FLAGS.CONNECTION} -DICE_t=1 -DTRANS_CLIENT -DTRANS_SERVER
17SOCK_DEFINES= -DBSD44SOCKETS 17SOCK_DEFINES= -DBSD44SOCKETS
18 18
19CPPFLAGS+= $(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES) 19CPPFLAGS+= $(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES)
20 20
21PKGDIST= ${LIB} 21PKGDIST= ${LIB}
22 22
 23CWARNFLAGS.clang+= -Wno-string-plus-int
 24
23.include <bsd.x11.mk> 25.include <bsd.x11.mk>
24.include <bsd.lib.mk> 26.include <bsd.lib.mk>
cvs diff -r1.8 -r1.9 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 2012/04/04 10:59:45 1.9
@@ -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.9 2012/04/04 10:59:45 joerg 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 \
@@ -452,14 +452,16 @@ CPPFLAGS.imTransR.c= $(CONN_DEFINES) $(X @@ -452,14 +452,16 @@ CPPFLAGS.imTransR.c= $(CONN_DEFINES) $(X
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 464
 465CWARNFLAGS.clang+= -Wno-string-plus-int
 466
465.include "${NETBSDSRCDIR}/external/mit/xorg/tools/makekeys/Makefile.makekeys" 467.include "${NETBSDSRCDIR}/external/mit/xorg/tools/makekeys/Makefile.makekeys"
cvs diff -r1.8 -r1.9 src/external/mit/xorg/lib/libXfont/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/lib/libXfont/Makefile 2011/08/11 23:15:39 1.8
+++ src/external/mit/xorg/lib/libXfont/Makefile 2012/04/04 10:59:45 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.8 2011/08/11 23:15:39 joerg Exp $ 1# $NetBSD: Makefile,v 1.9 2012/04/04 10:59:45 joerg Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5LIB= Xfont 5LIB= Xfont
6XFONTDIR= ${X11SRCDIR.${LIB}} 6XFONTDIR= ${X11SRCDIR.${LIB}}
7.PATH: ${XFONTDIR}/src 7.PATH: ${XFONTDIR}/src
8.PATH: ${XFONTDIR}/src/FreeType 8.PATH: ${XFONTDIR}/src/FreeType
9#.PATH: ${XFONTDIR}/src/Speedo 9#.PATH: ${XFONTDIR}/src/Speedo
10#.PATH: ${XFONTDIR}/src/Type1 10#.PATH: ${XFONTDIR}/src/Type1
11.PATH: ${XFONTDIR}/src/bitmap 11.PATH: ${XFONTDIR}/src/bitmap
12.PATH: ${XFONTDIR}/src/builtins 12.PATH: ${XFONTDIR}/src/builtins
13.PATH: ${XFONTDIR}/src/fc 13.PATH: ${XFONTDIR}/src/fc
14.PATH: ${XFONTDIR}/src/fontcache 14.PATH: ${XFONTDIR}/src/fontcache
@@ -36,36 +36,35 @@ INCS= bdfint.h bitmap.h bufio.h fntfil.h @@ -36,36 +36,35 @@ INCS= bdfint.h bitmap.h bufio.h fntfil.h
36 fontutil.h fontxlfd.h ft.h ftfuncs.h pcf.h 36 fontutil.h fontxlfd.h ft.h ftfuncs.h pcf.h
37INCSDIR=${X11INCDIR}/X11/fonts 37INCSDIR=${X11INCDIR}/X11/fonts
38 38
39CPPFLAGS+= ${X11FLAGS.THREADLIB} ${X11FLAGS.CONNECTION} 39CPPFLAGS+= ${X11FLAGS.THREADLIB} ${X11FLAGS.CONNECTION}
40CPPFLAGS+= -DHAS_SNPRINTF -DHAVE_CONFIG_H 40CPPFLAGS+= -DHAS_SNPRINTF -DHAVE_CONFIG_H
41CPPFLAGS+= -DBDFFORMAT -DSNFFORMAT -DPCFFORMAT -DX_GZIP_FONT_COMPRESSION -DX_BZIP2_FONT_COMPRESSION 41CPPFLAGS+= -DBDFFORMAT -DSNFFORMAT -DPCFFORMAT -DX_GZIP_FONT_COMPRESSION -DX_BZIP2_FONT_COMPRESSION
42CPPFLAGS+= -DFONT_ENCODINGS_DIRECTORY=\"${X11LIBDIR}/X11/fonts/encodings/encodings.dir\"  42CPPFLAGS+= -DFONT_ENCODINGS_DIRECTORY=\"${X11LIBDIR}/X11/fonts/encodings/encodings.dir\"
43CPPFLAGS+= -I${DESTDIR}${X11INCDIR} 43CPPFLAGS+= -I${DESTDIR}${X11INCDIR}
44CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/fonts 44CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/fonts
45CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2 45CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2
46CPPFLAGS+= -I${XFONTDIR}/src/stubs 46CPPFLAGS+= -I${XFONTDIR}/src/stubs
47CPPFLAGS+= -I${XFONTDIR}/../include 47CPPFLAGS+= -I${XFONTDIR}/../include
48 48
49 
50LIBDPLIBS=\ 49LIBDPLIBS=\
51 Xt ${.CURDIR}/../libXt \ 50 Xt ${.CURDIR}/../libXt \
52 SM ${.CURDIR}/../libSM \ 51 SM ${.CURDIR}/../libSM \
53 ICE ${.CURDIR}/../libICE \ 52 ICE ${.CURDIR}/../libICE \
54 Xext ${.CURDIR}/../libXext \ 53 Xext ${.CURDIR}/../libXext \
55 fontenc ${.CURDIR}/../libfontenc \ 54 fontenc ${.CURDIR}/../libfontenc \
56 freetype ${.CURDIR}/../freetype \ 55 freetype ${.CURDIR}/../freetype \
57 X11 ${.CURDIR}/../libX11/dynamic \ 56 X11 ${.CURDIR}/../libX11/dynamic \
58 m ${.CURDIR}/../../../../../lib/libm \ 57 m ${.CURDIR}/../../../../../lib/libm \
59 z ${.CURDIR}/../../../../../lib/libz \ 58 z ${.CURDIR}/../../../../../lib/libz \
60 bz2 ${.CURDIR}/../../../../../lib/libbz2 59 bz2 ${.CURDIR}/../../../../../lib/libbz2
61 60
62# XXX 61# XXX
63COPTS.ffcheck.c+= -Wno-error 62COPTS.ffcheck.c+= -Wno-error
64COPTS.register.c+= -Wno-error 63COPTS.register.c+= -Wno-error
65 64
66PKGDIST= ${LIB} 65PKGDIST= ${LIB}
67 66
68CWARNFLAGS.clang+= -Wno-tautological-compare 67CWARNFLAGS.clang+= -Wno-tautological-compare -Wno-string-plus-int
69 68
70.include <bsd.x11.mk> 69.include <bsd.x11.mk>
71.include <bsd.lib.mk> 70.include <bsd.lib.mk>
cvs diff -r1.3 -r1.4 src/gnu/usr.bin/diffutils/diff/Attic/Makefile (expand / switch to unified diff)

--- src/gnu/usr.bin/diffutils/diff/Attic/Makefile 2011/05/26 12:56:27 1.3
+++ src/gnu/usr.bin/diffutils/diff/Attic/Makefile 2012/04/04 10:59:46 1.4
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1# $NetBSD: Makefile,v 1.3 2011/05/26 12:56:27 joerg Exp $ 1# $NetBSD: Makefile,v 1.4 2012/04/04 10:59:46 joerg Exp $
2 2
3.include "${.CURDIR}/../Makefile.inc" 3.include "${.CURDIR}/../Makefile.inc"
4 4
5DIST= ${IDIST}/src 5DIST= ${IDIST}/src
6.PATH: ${DIST} ${IDIST}/doc ${IDIST}/man 6.PATH: ${DIST} ${IDIST}/doc ${IDIST}/man
7 7
8PROG= diff 8PROG= diff
9SRCS= analyze.c context.c diff.c dir.c ed.c ifdef.c io.c \ 9SRCS= analyze.c context.c diff.c dir.c ed.c ifdef.c io.c \
10 normal.c side.c util.c version.c 10 normal.c side.c util.c version.c
11 11
12DPADD+= ${LIBDIFFUTILS} 12DPADD+= ${LIBDIFFUTILS}
13LDADD+= ${LIBDIFFUTILS} 13LDADD+= ${LIBDIFFUTILS}
14 14
15INFOFLAGS= -I${IDIST}/doc 15INFOFLAGS= -I${IDIST}/doc
16TEXINFO= diff.texi 16TEXINFO= diff.texi
17 17
18COPTS.ifdef.c = -Wno-stack-protector 18COPTS.ifdef.c = -Wno-stack-protector
19 19
20CWARNFLAGS.clang+= -Wno-unused-value 20CWARNFLAGS.clang+= -Wno-unused-value -Wno-string-plus-int
21 21
22.include <bsd.info.mk> 22.include <bsd.info.mk>
23.include <bsd.prog.mk> 23.include <bsd.prog.mk>
cvs diff -r1.23 -r1.24 src/gnu/usr.bin/rcs/lib/Attic/Makefile (expand / switch to unified diff)

--- src/gnu/usr.bin/rcs/lib/Attic/Makefile 2011/05/26 12:56:29 1.23
+++ src/gnu/usr.bin/rcs/lib/Attic/Makefile 2012/04/04 10:59:46 1.24
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1# $NetBSD: Makefile,v 1.23 2011/05/26 12:56:29 joerg Exp $ 1# $NetBSD: Makefile,v 1.24 2012/04/04 10:59:46 joerg Exp $
2 2
3LIBISPRIVATE= yes 3LIBISPRIVATE= yes
4 4
5# Define FSYNC_ALL to get slower but safer writes in case of crashes in 5# Define FSYNC_ALL to get slower but safer writes in case of crashes in
6# the middle of CVS/RCS changes 6# the middle of CVS/RCS changes
7CPPFLAGS+=-DFSYNC_ALL 7CPPFLAGS+=-DFSYNC_ALL
8 8
9.include <bsd.own.mk> # for RCS_LOCALID 9.include <bsd.own.mk> # for RCS_LOCALID
10 10
11# If you wish to use a different Id token in addition to Id, 11# If you wish to use a different Id token in addition to Id,
12# set the variable RCS_LOCALID in mk.conf or environment. 12# set the variable RCS_LOCALID in mk.conf or environment.
13.if defined(RCS_LOCALID) 13.if defined(RCS_LOCALID)
14CPPFLAGS+=-DLOCALID=\"${RCS_LOCALID}\" 14CPPFLAGS+=-DLOCALID=\"${RCS_LOCALID}\"
15.endif 15.endif
16 16
17LIB= rcs 17LIB= rcs
18SRCS= maketime.c merger.c partime.c rcsedit.c rcsfcmp.c rcsfnms.c rcsgen.c \ 18SRCS= maketime.c merger.c partime.c rcsedit.c rcsfcmp.c rcsfnms.c rcsgen.c \
19 rcskeep.c rcskeys.c rcslex.c rcsmap.c rcsrev.c rcssyn.c rcstime.c \ 19 rcskeep.c rcskeys.c rcslex.c rcsmap.c rcsrev.c rcssyn.c rcstime.c \
20 rcsutil.c version.c 20 rcsutil.c version.c
21 21
22CWARNFLAGS.clang+= -Wno-format-security 22CWARNFLAGS.clang+= -Wno-format-security -Wno-string-plus-int
23 23
24.include <bsd.lib.mk> 24.include <bsd.lib.mk>
cvs diff -r1.7 -r1.8 src/gnu/usr.bin/rcs/rlog/Attic/Makefile (expand / switch to unified diff)

--- src/gnu/usr.bin/rcs/rlog/Attic/Makefile 1998/04/20 14:16:01 1.7
+++ src/gnu/usr.bin/rcs/rlog/Attic/Makefile 2012/04/04 10:59:46 1.8
@@ -1,7 +1,9 @@ @@ -1,7 +1,9 @@
1# $NetBSD: Makefile,v 1.7 1998/04/20 14:16:01 lukem Exp $ 1# $NetBSD: Makefile,v 1.8 2012/04/04 10:59:46 joerg Exp $
2 2
3PROG= rlog 3PROG= rlog
4LINKS= ${BINDIR}/rlog ${BINDIR}/rcslog 4LINKS= ${BINDIR}/rlog ${BINDIR}/rcslog
5MLINKS= rlog.1 rcslog.1 5MLINKS= rlog.1 rcslog.1
6 6
 7CWARNFLAGS.clang+= -Wno-string-plus-int
 8
7.include <bsd.prog.mk> 9.include <bsd.prog.mk>
cvs diff -r1.122 -r1.123 src/lib/libm/Makefile (expand / switch to unified diff)

--- src/lib/libm/Makefile 2012/03/21 05:37:42 1.122
+++ src/lib/libm/Makefile 2012/04/04 10:59:46 1.123
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.122 2012/03/21 05:37:42 matt Exp $ 1# $NetBSD: Makefile,v 1.123 2012/04/04 10:59:46 joerg Exp $
2# 2#
3# @(#)Makefile 5.1beta 93/09/24 3# @(#)Makefile 5.1beta 93/09/24
4# 4#
5# ==================================================== 5# ====================================================
6# Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. 6# Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
7# 7#
8# Developed at SunPro, a Sun Microsystems, Inc. business. 8# Developed at SunPro, a Sun Microsystems, Inc. business.
9# Permission to use, copy, modify, and distribute this 9# Permission to use, copy, modify, and distribute this
10# software is freely granted, provided that this notice 10# software is freely granted, provided that this notice
11# is preserved. 11# is preserved.
12# ==================================================== 12# ====================================================
13# 13#
14# 14#
@@ -155,30 +155,28 @@ COMMON_SRCS+= e_acos.c e_acosf.c e_acosh @@ -155,30 +155,28 @@ COMMON_SRCS+= e_acos.c e_acosf.c e_acosh
155 w_gamma_r.c w_gammaf.c w_gammaf_r.c w_hypot.c w_hypotf.c w_j0.c \ 155 w_gamma_r.c w_gammaf.c w_gammaf_r.c w_hypot.c w_hypotf.c w_j0.c \
156 w_j0f.c w_j1.c w_j1f.c w_jn.c w_jnf.c w_lgamma.c w_lgamma_r.c \ 156 w_j0f.c w_j1.c w_j1f.c w_jn.c w_jnf.c w_lgamma.c w_lgamma_r.c \
157 w_lgammaf.c w_lgammaf_r.c w_log.c w_log10.c w_log10f.c w_log2.c \ 157 w_lgammaf.c w_lgammaf_r.c w_log.c w_log10.c w_log10f.c w_log2.c \
158 w_log2f.c w_logf.c \ 158 w_log2f.c w_logf.c \
159 w_pow.c w_powf.c w_remainder.c w_remainderf.c w_scalb.c w_scalbf.c \ 159 w_pow.c w_powf.c w_remainder.c w_remainderf.c w_scalb.c w_scalbf.c \
160 w_sinh.c w_sinhf.c w_sqrt.c w_sqrtf.c \ 160 w_sinh.c w_sinhf.c w_sqrt.c w_sqrtf.c \
161 lrint.c lrintf.c llrint.c llrintf.c lround.c lroundf.c llround.c \ 161 lrint.c lrintf.c llrint.c llrintf.c lround.c lroundf.c llround.c \
162 llroundf.c s_frexp.c s_ldexp.c s_modf.c \ 162 llroundf.c s_frexp.c s_ldexp.c s_modf.c \
163 s_fmax.c s_fmaxf.c s_fmaxl.c s_fmin.c s_fminf.c s_fminl.c s_fdim.c 163 s_fmax.c s_fmaxf.c s_fmaxl.c s_fmin.c s_fminf.c s_fminl.c s_fdim.c
164 164
165.PATH: ${.CURDIR}/compat 165.PATH: ${.CURDIR}/compat
166COMMON_SRCS+= compat_cabs.c compat_cabsf.c 166COMMON_SRCS+= compat_cabs.c compat_cabsf.c
167# XXX our compatibility cabs() is different! 167# XXX our compatibility cabs() is different!
168.if defined(HAVE_GCC) 168COPTS.compat_cabs.c= ${${ACTIVE_CC} == "gcc":? -fno-builtin-cabs :}
169COPTS.compat_cabs.c= -fno-builtin-cabs 169COPTS.compat_cabsf.c= ${${ACTIVE_CC} == "gcc":? -fno-builtin-cabsf :}
170COPTS.compat_cabsf.c= -fno-builtin-cabsf 
171.endif 
172 170
173# math routines for non-IEEE architectures. 171# math routines for non-IEEE architectures.
174NOIEEE_SRCS = n_asincos.c n_acosh.c n_asinh.c n_atan.c n_atanh.c n_cosh.c \ 172NOIEEE_SRCS = n_asincos.c n_acosh.c n_asinh.c n_atan.c n_atanh.c n_cosh.c \
175 n_erf.c n_exp.c n_exp__E.c n_expm1.c n_floor.c n_fmod.c n_gamma.c \ 173 n_erf.c n_exp.c n_exp__E.c n_expm1.c n_floor.c n_fmod.c n_gamma.c \
176 n_lgamma.c n_j0.c n_j1.c n_jn.c n_log.c n_log10.c n_log1p.c \ 174 n_lgamma.c n_j0.c n_j1.c n_jn.c n_log.c n_log10.c n_log1p.c \
177 n_log__L.c n_pow.c n_sinh.c n_tanh.c \ 175 n_log__L.c n_pow.c n_sinh.c n_tanh.c \
178 n_sincos.c n_tan.c \ 176 n_sincos.c n_tan.c \
179 n_round.c n_roundf.c n_lround.c n_lroundf.c \ 177 n_round.c n_roundf.c n_lround.c n_lroundf.c \
180 n_fmax.c n_fmaxf.c n_fmin.c n_fminf.c 178 n_fmax.c n_fmaxf.c n_fmin.c n_fminf.c
181# n_sqrt.c n_argred.c n_infnan.c n_atan2.c n_cabs.c n_cbrt.c n_support.c 179# n_sqrt.c n_argred.c n_infnan.c n_atan2.c n_cabs.c n_cbrt.c n_support.c
182 180
183 181
184# NetBSD's C library supplies these functions: 182# NetBSD's C library supplies these functions:
cvs diff -r1.75 -r1.76 src/lib/libpthread/Makefile (expand / switch to unified diff)

--- src/lib/libpthread/Makefile 2012/03/21 05:37:43 1.75
+++ src/lib/libpthread/Makefile 2012/04/04 10:59:46 1.76
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.75 2012/03/21 05:37:43 matt Exp $ 1# $NetBSD: Makefile,v 1.76 2012/04/04 10:59:46 joerg Exp $
2# 2#
3 3
4WARNS?= 5 4WARNS?= 5
5 5
6.include <bsd.own.mk> 6.include <bsd.own.mk>
7 7
8.if defined(PTHREAD_MACHINE_ARCH) && !empty(PTHREAD_MACHINE_ARCH) && \ 8.if defined(PTHREAD_MACHINE_ARCH) && !empty(PTHREAD_MACHINE_ARCH) && \
9 exists(${.CURDIR}/arch/${PTHREAD_MACHINE_ARCH}) 9 exists(${.CURDIR}/arch/${PTHREAD_MACHINE_ARCH})
10ARCHSUBDIR= ${PTHREAD_MACHINE_ARCH} 10ARCHSUBDIR= ${PTHREAD_MACHINE_ARCH}
11.elif exists(${.CURDIR}/arch/${MACHINE_ARCH}) 11.elif exists(${.CURDIR}/arch/${MACHINE_ARCH})
12ARCHSUBDIR= ${MACHINE_ARCH} 12ARCHSUBDIR= ${MACHINE_ARCH}
13.elif exists(${.CURDIR}/arch/${MACHINE_CPU})  13.elif exists(${.CURDIR}/arch/${MACHINE_CPU})
14ARCHSUBDIR= ${MACHINE_CPU} 14ARCHSUBDIR= ${MACHINE_CPU}
@@ -59,41 +59,43 @@ SRCS+= sem.c @@ -59,41 +59,43 @@ SRCS+= sem.c
59.if exists(${ARCHDIR}/pthread_md.S) 59.if exists(${ARCHDIR}/pthread_md.S)
60SRCS+= pthread_md.S 60SRCS+= pthread_md.S
61.endif 61.endif
62 62
63.if defined(PTHREAD__COMPAT) 63.if defined(PTHREAD__COMPAT)
64SRCS+= pthread_compat.c 64SRCS+= pthread_compat.c
65.PATH.c: ${.CURDIR}/../../common/lib/libc/arch/${ARCHSUBDIR}/atomic 65.PATH.c: ${.CURDIR}/../../common/lib/libc/arch/${ARCHSUBDIR}/atomic
66.PATH.S: ${.CURDIR}/../../common/lib/libc/arch/${ARCHSUBDIR}/atomic 66.PATH.S: ${.CURDIR}/../../common/lib/libc/arch/${ARCHSUBDIR}/atomic
67.PATH.c: ${.CURDIR}/../../common/lib/libc/atomic 67.PATH.c: ${.CURDIR}/../../common/lib/libc/atomic
68.PATH.c: ${.CURDIR}/../libc/misc 68.PATH.c: ${.CURDIR}/../libc/misc
69.include "../../common/lib/libc/arch/${ARCHSUBDIR}/atomic/Makefile.inc" 69.include "../../common/lib/libc/arch/${ARCHSUBDIR}/atomic/Makefile.inc"
70.endif 70.endif
71 71
 72ALIGN_FUNCTIONS= ${${ACTIVE_CC} == "gcc":? -falign-functions=32 :}
 73
72# The TSD routines are used in the implementation of profiling, and so 74# The TSD routines are used in the implementation of profiling, and so
73# can't be profiled themselves. 75# can't be profiled themselves.
74COPTS.pthread_specific.c+= -fomit-frame-pointer -falign-functions=32 76COPTS.pthread_specific.c+= -fomit-frame-pointer ${ALIGN_FUNCTIONS}
75pthread_specific.po: pthread_specific.o 77pthread_specific.po: pthread_specific.o
76 ${_MKTARGET_CREATE} 78 ${_MKTARGET_CREATE}
77 cp pthread_specific.o pthread_specific.po 79 cp pthread_specific.o pthread_specific.po
78 80
79# Internal spinlock routines are performance critical. Don't profile them, 81# Internal spinlock routines are performance critical. Don't profile them,
80# it's incompatibile with -fomit-frame-pointer. 82# it's incompatibile with -fomit-frame-pointer.
81COPTS.pthread_lock.c+= -fomit-frame-pointer -falign-functions=32 83COPTS.pthread_lock.c+= -fomit-frame-pointer ${ALIGN_FUNCTIONS}
82pthread_lock.po: pthread_lock.o 84pthread_lock.po: pthread_lock.o
83 ${_MKTARGET_CREATE} 85 ${_MKTARGET_CREATE}
84 cp pthread_lock.o pthread_lock.po 86 cp pthread_lock.o pthread_lock.po
85 87
86COPTS.pthread_mutex.c+= -fomit-frame-pointer -falign-functions=32 88COPTS.pthread_mutex.c+= -fomit-frame-pointer ${ALIGN_FUNCTIONS}
87pthread_mutex.po: pthread_mutex.o 89pthread_mutex.po: pthread_mutex.o
88 ${_MKTARGET_CREATE} 90 ${_MKTARGET_CREATE}
89 cp pthread_mutex.o pthread_mutex.po 91 cp pthread_mutex.o pthread_mutex.po
90 92
91COPTS.pthread.c += -Wno-stack-protector -Wno-format-nonliteral 93COPTS.pthread.c += -Wno-stack-protector -Wno-format-nonliteral
92COPTS.pthread_attr.c += -Wno-format-nonliteral 94COPTS.pthread_attr.c += -Wno-format-nonliteral
93 95
94MAN+= affinity.3 pthread.3 \ 96MAN+= affinity.3 pthread.3 \
95 pthread_attr.3 \ 97 pthread_attr.3 \
96 pthread_attr_get_np.3 \ 98 pthread_attr_get_np.3 \
97 pthread_attr_getdetachstate.3 \ 99 pthread_attr_getdetachstate.3 \
98 pthread_attr_getguardsize.3 \ 100 pthread_attr_getguardsize.3 \
99 pthread_attr_getinheritsched.3 \ 101 pthread_attr_getinheritsched.3 \
cvs diff -r1.5 -r1.6 src/regress/sys/kern/ras/ras1/Makefile (expand / switch to unified diff)

--- src/regress/sys/kern/ras/ras1/Makefile 2011/06/20 07:43:59 1.5
+++ src/regress/sys/kern/ras/ras1/Makefile 2012/04/04 10:59:47 1.6
@@ -1,20 +1,18 @@ @@ -1,20 +1,18 @@
1# $NetBSD: Makefile,v 1.5 2011/06/20 07:43:59 mrg Exp $ 1# $NetBSD: Makefile,v 1.6 2012/04/04 10:59:47 joerg Exp $
2 2
3NOMAN= #defined 3NOMAN= #defined
4 4
5PROG= ras1 5PROG= ras1
6WARNS= 2 6WARNS= 2
7 7
8regress: 8regress:
9 @if ./${PROG} ; then \ 9 @if ./${PROG} ; then \
10 echo "PASSED"; \ 10 echo "PASSED"; \
11 else \ 11 else \
12 echo "FAILED"; \ 12 echo "FAILED"; \
13 fi 13 fi
14 14
15.include <bsd.prog.mk> 15CFLAGS+= ${${ACTIVE_CC} == "gcc":? -fno-reorder-blocks :}
16 16
17.if defined(HAVE_GCC) 17.include <bsd.prog.mk>
18CFLAGS+= -fno-reorder-blocks 
19.endif 
20 18
cvs diff -r1.5 -r1.6 src/regress/sys/kern/ras/ras2/Makefile (expand / switch to unified diff)

--- src/regress/sys/kern/ras/ras2/Makefile 2011/06/20 07:43:59 1.5
+++ src/regress/sys/kern/ras/ras2/Makefile 2012/04/04 10:59:47 1.6
@@ -1,19 +1,17 @@ @@ -1,19 +1,17 @@
1# $NetBSD: Makefile,v 1.5 2011/06/20 07:43:59 mrg Exp $ 1# $NetBSD: Makefile,v 1.6 2012/04/04 10:59:47 joerg Exp $
2 2
3NOMAN= #defined 3NOMAN= #defined
4 4
5PROG= ras2 5PROG= ras2
6WARNS= 2 6WARNS= 2
7 7
8regress: 8regress:
9 @if ./${PROG} ; then \ 9 @if ./${PROG} ; then \
10 echo "PASSED"; \ 10 echo "PASSED"; \
11 else \ 11 else \
12 echo "FAILED"; \ 12 echo "FAILED"; \
13 fi 13 fi
14 14
15.include <bsd.prog.mk> 15CFLAGS+= ${${ACTIVE_CC} == "gcc":? -fno-reorder-blocks :}
16 16
17.if defined(HAVE_GCC) 17.include <bsd.prog.mk>
18CFLAGS+= -fno-reorder-blocks 
19.endif 
cvs diff -r1.5 -r1.6 src/regress/sys/kern/ras/ras3/Makefile (expand / switch to unified diff)

--- src/regress/sys/kern/ras/ras3/Makefile 2011/06/20 07:43:59 1.5
+++ src/regress/sys/kern/ras/ras3/Makefile 2012/04/04 10:59:47 1.6
@@ -1,18 +1,16 @@ @@ -1,18 +1,16 @@
1# $NetBSD: Makefile,v 1.5 2011/06/20 07:43:59 mrg Exp $ 1# $NetBSD: Makefile,v 1.6 2012/04/04 10:59:47 joerg Exp $
2 2
3NOMAN= #defined 3NOMAN= #defined
4PROG= ras3 4PROG= ras3
5WARNS= 2 5WARNS= 2
6 6
7regress: 7regress:
8 @if ./${PROG} ; then \ 8 @if ./${PROG} ; then \
9 echo "PASSED"; \ 9 echo "PASSED"; \
10 else \ 10 else \
11 echo "FAILED"; \ 11 echo "FAILED"; \
12 fi 12 fi
13 13
14.include <bsd.prog.mk> 14CFLAGS+= ${${ACTIVE_CC} == "gcc":? -fno-reorder-blocks :}
15 15
16.if defined(HAVE_GCC) 16.include <bsd.prog.mk>
17CFLAGS+= -fno-reorder-blocks 
18.endif 
cvs diff -r1.105 -r1.106 src/share/mk/bsd.x11.mk (expand / switch to unified diff)

--- src/share/mk/bsd.x11.mk 2012/01/17 19:40:08 1.105
+++ src/share/mk/bsd.x11.mk 2012/04/04 10:59:47 1.106
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.x11.mk,v 1.105 2012/01/17 19:40:08 njoly Exp $ 1# $NetBSD: bsd.x11.mk,v 1.106 2012/04/04 10:59:47 joerg Exp $
2 2
3.include <bsd.init.mk> 3.include <bsd.init.mk>
4 4
5BINDIR= ${X11BINDIR} 5BINDIR= ${X11BINDIR}
6LIBDIR= ${X11USRLIBDIR} 6LIBDIR= ${X11USRLIBDIR}
7MANDIR= ${X11MANDIR} 7MANDIR= ${X11MANDIR}
8 8
9COPTS+= -fno-strict-aliasing 9COPTS+= -fno-strict-aliasing
10 10
11.include <bsd.sys.mk> 11.include <bsd.sys.mk>
12 12
13.if defined(USE_SSP) && (${USE_SSP} != "no") 13.if defined(USE_SSP) && (${USE_SSP} != "no")
14CPPFLAGS+= -DNO_ALLOCA 14CPPFLAGS+= -DNO_ALLOCA
@@ -113,27 +113,27 @@ X11FLAGS.EXTENSION+= -D__GLX_ALIGN64 @@ -113,27 +113,27 @@ X11FLAGS.EXTENSION+= -D__GLX_ALIGN64
113 ${MACHINE} == "cats" || \ 113 ${MACHINE} == "cats" || \
114 ${MACHINE} == "i386" || \ 114 ${MACHINE} == "i386" || \
115 ${MACHINE} == "macppc" || \ 115 ${MACHINE} == "macppc" || \
116 ${MACHINE} == "netwinder" || \ 116 ${MACHINE} == "netwinder" || \
117 ${MACHINE} == "ofppc" || \ 117 ${MACHINE} == "ofppc" || \
118 ${MACHINE} == "prep" || \ 118 ${MACHINE} == "prep" || \
119 ${MACHINE} == "sgimips" || \ 119 ${MACHINE} == "sgimips" || \
120 ${MACHINE} == "sparc64" || \ 120 ${MACHINE} == "sparc64" || \
121 ${MACHINE} == "sparc" || \ 121 ${MACHINE} == "sparc" || \
122 ${MACHINE} == "shark" || \ 122 ${MACHINE} == "shark" || \
123 ${MACHINE} == "zaurus" 123 ${MACHINE} == "zaurus"
124# LOADABLE 124# LOADABLE
125X11FLAGS.LOADABLE= -DXFree86LOADER -DIN_MODULE -DXFree86Module \ 125X11FLAGS.LOADABLE= -DXFree86LOADER -DIN_MODULE -DXFree86Module \
126 -fno-merge-constants 126 ${${ACTIVE_CXX} == "gcc":? -fno-merge-constants :}
127.endif 127.endif
128  128
129# XXX FIX ME 129# XXX FIX ME
130.if ${X11FLAVOUR} == "Xorg" 130.if ${X11FLAVOUR} == "Xorg"
131XVENDORNAMESHORT= '"X.Org"' 131XVENDORNAMESHORT= '"X.Org"'
132XVENDORNAME= '"The X.Org Foundation"' 132XVENDORNAME= '"The X.Org Foundation"'
133XORG_RELEASE= '"Release 1.10.3"' 133XORG_RELEASE= '"Release 1.10.3"'
134__XKBDEFRULES__= '"xorg"' 134__XKBDEFRULES__= '"xorg"'
135XLOCALE.DEFINES= -DXLOCALEDIR=\"${X11LIBDIR}/locale\" \ 135XLOCALE.DEFINES= -DXLOCALEDIR=\"${X11LIBDIR}/locale\" \
136 -DXLOCALELIBDIR=\"${X11LIBDIR}/locale\" 136 -DXLOCALELIBDIR=\"${X11LIBDIR}/locale\"
137 137
138# XXX oh yeah, fix me later 138# XXX oh yeah, fix me later
139XORG_VERSION_CURRENT="(((1) * 10000000) + ((10) * 100000) + ((3) * 1000) + 0)" 139XORG_VERSION_CURRENT="(((1) * 10000000) + ((10) * 100000) + ((3) * 1000) + 0)"
cvs diff -r1.4 -r1.5 src/tests/lib/libc/ssp/Makefile (expand / switch to unified diff)

--- src/tests/lib/libc/ssp/Makefile 2011/06/12 21:12:46 1.4
+++ src/tests/lib/libc/ssp/Makefile 2012/04/04 10:59:48 1.5
@@ -1,24 +1,27 @@ @@ -1,24 +1,27 @@
1# $NetBSD: Makefile,v 1.4 2011/06/12 21:12:46 plunky Exp $ 1# $NetBSD: Makefile,v 1.5 2012/04/04 10:59:48 joerg Exp $
2 2
3NOMAN= # defined 3NOMAN= # defined
4 4
5.include <bsd.own.mk> 5.include <bsd.own.mk>
6 6
7WARNS= 4 7WARNS= 4
8 8
9CPPFLAGS+= -D_FORTIFY_SOURCE=2 9CPPFLAGS+= -D_FORTIFY_SOURCE=2
10 10
11COPTS.h_raw.c= -fstack-protector-all -Wstack-protector --param=ssp-buffer-size=1 11COPTS.h_raw.c= -fstack-protector-all -Wstack-protector
 12COPTS.h_raw.c+= ${${ACTIVE_CC} == "gcc":? --param ssp-buffer-size=1 :}
 13COPTS.h_raw.c+= ${${ACTIVE_CC} == "clang":? -mllvm -stack-protector-buffer-size=1 :}
 14
12 15
13# Bootstrap hack 16# Bootstrap hack
14 17
15.ifmake !clean && !obj && !cleandir 18.ifmake !clean && !obj && !cleandir
16.BEGIN: 19.BEGIN:
17 ${AR} cr libssp_nonshared.a 20 ${AR} cr libssp_nonshared.a
18.endif 21.endif
19 22
20CLEANFILES+= libssp_nonshared.a 23CLEANFILES+= libssp_nonshared.a
21LDFLAGS+= -L. 24LDFLAGS+= -L.
22 25
23TESTSDIR= ${TESTSBASE}/lib/libc/ssp 26TESTSDIR= ${TESTSBASE}/lib/libc/ssp
24 27