Thu Jun 4 16:38:11 2015 UTC ()
Update to 20150605

* If NOGCCERROR is not defined, add -Wno-error to CFLAGS instead of -Werror.
  NOGCCERROR means 'do not treat warnings as errors'.


(ryoon)
diff -r1.44 -r1.45 pkgsrc/pkgtools/bootstrap-mk-files/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/pkgtools/bootstrap-mk-files/files/bsd.sys.mk
diff -r1.1.1.1 -r1.2 pkgsrc/pkgtools/bootstrap-mk-files/files/mods/SunOS.bsd.sys.mk
cvs diff -r1.44 -r1.45 pkgsrc/pkgtools/bootstrap-mk-files/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/bootstrap-mk-files/Makefile 2014/11/22 16:32:13 1.44
+++ pkgsrc/pkgtools/bootstrap-mk-files/Makefile 2015/06/04 16:38:10 1.45
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.44 2014/11/22 16:32:13 bsiegert Exp $ 1# $NetBSD: Makefile,v 1.45 2015/06/04 16:38:10 ryoon Exp $
2 2
3PKGNAME= bootstrap-mk-files-20141122 3PKGNAME= bootstrap-mk-files-20150605
4CATEGORIES= pkgtools 4CATEGORIES= pkgtools
5 5
6CONFLICTS+= mk-files-[0-9]* 6CONFLICTS+= mk-files-[0-9]*
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.pkgsrc.org/ 9HOMEPAGE= http://www.pkgsrc.org/
10COMMENT= *.mk files for the bootstrap bmake utility 10COMMENT= *.mk files for the bootstrap bmake utility
11 11
12NO_PKGTOOLS_REQD_CHECK= # defined 12NO_PKGTOOLS_REQD_CHECK= # defined
13BOOTSTRAP_PKG= yes 13BOOTSTRAP_PKG= yes
14 14
15NO_BUILD= yes 15NO_BUILD= yes
16 16
cvs diff -r1.1.1.1 -r1.2 pkgsrc/pkgtools/bootstrap-mk-files/files/bsd.sys.mk (expand / switch to unified diff)

--- pkgsrc/pkgtools/bootstrap-mk-files/files/bsd.sys.mk 2006/07/14 23:13:01 1.1.1.1
+++ pkgsrc/pkgtools/bootstrap-mk-files/files/bsd.sys.mk 2015/06/04 16:38:10 1.2
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: bsd.sys.mk,v 1.1.1.1 2006/07/14 23:13:01 jlam Exp $ 1# $NetBSD: bsd.sys.mk,v 1.2 2015/06/04 16:38:10 ryoon Exp $
2# 2#
3# Overrides used for NetBSD source tree builds. 3# Overrides used for NetBSD source tree builds.
4 4
5.if defined(WARNS) 5.if defined(WARNS)
6.if ${WARNS} > 0 6.if ${WARNS} > 0
7CFLAGS+= -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith 7CFLAGS+= -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith
8# XXX Delete -Wuninitialized by default for now -- the compiler doesn't 8# XXX Delete -Wuninitialized by default for now -- the compiler doesn't
9# XXX always get it right. 9# XXX always get it right.
10CFLAGS+= -Wno-uninitialized 10CFLAGS+= -Wno-uninitialized
11.endif 11.endif
12.if ${WARNS} > 1 12.if ${WARNS} > 1
13CFLAGS+=-Wreturn-type -Wcast-qual -Wpointer-arith -Wwrite-strings 13CFLAGS+=-Wreturn-type -Wcast-qual -Wpointer-arith -Wwrite-strings
14CFLAGS+=-Wswitch -Wshadow 14CFLAGS+=-Wswitch -Wshadow
15.endif 15.endif
16.endif 16.endif
17 17
18.if defined(WFORMAT) && defined(FORMAT_AUDIT) 18.if defined(WFORMAT) && defined(FORMAT_AUDIT)
19.if ${WFORMAT} > 1 19.if ${WFORMAT} > 1
20CFLAGS+=-Wnetbsd-format-audit -Wno-format-extra-args 20CFLAGS+=-Wnetbsd-format-audit -Wno-format-extra-args
21.endif 21.endif
22.endif 22.endif
23 23
24.if !defined(NOGCCERROR) 24.if !defined(NOGCCERROR)
25CFLAGS+= -Werror 25CFLAGS+= -Wno-error
26.endif 26.endif
27CFLAGS+= ${CWARNFLAGS} 27CFLAGS+= ${CWARNFLAGS}
28 28
29.if defined(DESTDIR) 29.if defined(DESTDIR)
30CPPFLAGS+= -nostdinc -idirafter ${DESTDIR}/usr/include 30CPPFLAGS+= -nostdinc -idirafter ${DESTDIR}/usr/include
31LINTFLAGS+= -d ${DESTDIR}/usr/include 31LINTFLAGS+= -d ${DESTDIR}/usr/include
32.endif 32.endif
33 33
34.if defined(AUDIT) 34.if defined(AUDIT)
35CPPFLAGS+= -D__AUDIT__ 35CPPFLAGS+= -D__AUDIT__
36.endif 36.endif
37 37
38.if defined(MKSOFTFLOAT) && (${MKSOFTFLOAT} != "no") 38.if defined(MKSOFTFLOAT) && (${MKSOFTFLOAT} != "no")
cvs diff -r1.1.1.1 -r1.2 pkgsrc/pkgtools/bootstrap-mk-files/files/mods/SunOS.bsd.sys.mk (expand / switch to unified diff)

--- pkgsrc/pkgtools/bootstrap-mk-files/files/mods/SunOS.bsd.sys.mk 2006/07/14 23:13:01 1.1.1.1
+++ pkgsrc/pkgtools/bootstrap-mk-files/files/mods/SunOS.bsd.sys.mk 2015/06/04 16:38:10 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: SunOS.bsd.sys.mk,v 1.1.1.1 2006/07/14 23:13:01 jlam Exp $ 1# $NetBSD: SunOS.bsd.sys.mk,v 1.2 2015/06/04 16:38:10 ryoon Exp $
2# 2#
3# Overrides used for NetBSD source tree builds. 3# Overrides used for NetBSD source tree builds.
4 4
5.if ${CC:M*gcc*} != "" 5.if ${CC:M*gcc*} != ""
6 6
7.if defined(WARNS) 7.if defined(WARNS)
8.if ${WARNS} > 0 8.if ${WARNS} > 0
9CFLAGS+= -Wall -Wstrict-prototypes -Wmissing-prototypes 9CFLAGS+= -Wall -Wstrict-prototypes -Wmissing-prototypes
10# XXX Delete -Wuninitialized by default for now -- the compiler doesn't 10# XXX Delete -Wuninitialized by default for now -- the compiler doesn't
11# XXX always get it right. 11# XXX always get it right.
12CFLAGS+= -Wno-uninitialized 12CFLAGS+= -Wno-uninitialized
13.endif 13.endif
14.if ${WARNS} > 1 14.if ${WARNS} > 1
@@ -17,27 +17,27 @@ CFLAGS+= -Wreturn-type -Wpointer-arith @@ -17,27 +17,27 @@ CFLAGS+= -Wreturn-type -Wpointer-arith
17.if ${WARNS} > 2 17.if ${WARNS} > 2
18CFLAGS+= -Wcast-qual -Wwrite-strings 18CFLAGS+= -Wcast-qual -Wwrite-strings
19.endif 19.endif
20CFLAGS+= -Wswitch -Wshadow 20CFLAGS+= -Wswitch -Wshadow
21.endif 21.endif
22 22
23.if defined(WFORMAT) && defined(FORMAT_AUDIT) 23.if defined(WFORMAT) && defined(FORMAT_AUDIT)
24.if ${WFORMAT} > 1 24.if ${WFORMAT} > 1
25CFLAGS+= -Wnetbsd-format-audit -Wno-format-extra-args 25CFLAGS+= -Wnetbsd-format-audit -Wno-format-extra-args
26.endif 26.endif
27.endif 27.endif
28 28
29.if !defined(NOGCCERROR) 29.if !defined(NOGCCERROR)
30CFLAGS+= -Werror 30CFLAGS+= -Wno-error
31.endif 31.endif
32CFLAGS+= ${CWARNFLAGS} 32CFLAGS+= ${CWARNFLAGS}
33 33
34.if defined(DESTDIR) 34.if defined(DESTDIR)
35CPPFLAGS+= -nostdinc -idirafter ${DESTDIR}/usr/include 35CPPFLAGS+= -nostdinc -idirafter ${DESTDIR}/usr/include
36LINTFLAGS+= -d ${DESTDIR}/usr/include 36LINTFLAGS+= -d ${DESTDIR}/usr/include
37.endif 37.endif
38 38
39.if defined(MKSOFTFLOAT) && (${MKSOFTFLOAT} != "no") 39.if defined(MKSOFTFLOAT) && (${MKSOFTFLOAT} != "no")
40COPTS+= -msoft-float 40COPTS+= -msoft-float
41FOPTS+= -msoft-float 41FOPTS+= -msoft-float
42.endif 42.endif
43 43