[pkgsrc/trunk]: pkgsrc/pkgtools/bootstrap-mk-files bootstrap-mk-files-20160908:

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ae98badd3a0e
branches:  trunk
changeset: 352160:ae98badd3a0e
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Sep 08 14:28:12 2016 +0000

description:
bootstrap-mk-files-20160908:
Unless a platform explicitly sets DBG, default to -O2 on all
architectures. Most importantly, don't default to unoptimized builds
on AMD64.

diffstat:

 pkgtools/bootstrap-mk-files/Makefile                  |   4 ++--
 pkgtools/bootstrap-mk-files/files/mods/AIX.sys.mk     |  17 ++---------------
 pkgtools/bootstrap-mk-files/files/mods/IRIX.sys.mk    |   4 ++--
 pkgtools/bootstrap-mk-files/files/mods/Linux.sys.mk   |  17 ++---------------
 pkgtools/bootstrap-mk-files/files/mods/Minix.sys.mk   |   4 ++--
 pkgtools/bootstrap-mk-files/files/mods/NetBSD.sys.mk  |  17 ++---------------
 pkgtools/bootstrap-mk-files/files/mods/OpenBSD.sys.mk |  12 ++----------
 pkgtools/bootstrap-mk-files/files/mods/QNX.sys.mk     |  17 ++---------------
 pkgtools/bootstrap-mk-files/files/mods/SunOS.sys.mk   |  17 ++---------------
 pkgtools/bootstrap-mk-files/files/sys.mk              |  17 ++---------------
 10 files changed, 20 insertions(+), 106 deletions(-)

diffs (260 lines):

diff -r cf536eafb977 -r ae98badd3a0e pkgtools/bootstrap-mk-files/Makefile
--- a/pkgtools/bootstrap-mk-files/Makefile      Thu Sep 08 14:14:33 2016 +0000
+++ b/pkgtools/bootstrap-mk-files/Makefile      Thu Sep 08 14:28:12 2016 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.51 2016/04/11 12:37:48 jperkin Exp $
+# $NetBSD: Makefile,v 1.52 2016/09/08 14:28:12 joerg Exp $
 
-PKGNAME=       bootstrap-mk-files-20160411
+PKGNAME=       bootstrap-mk-files-20160908
 CATEGORIES=    pkgtools
 
 CONFLICTS+=    mk-files-[0-9]*
diff -r cf536eafb977 -r ae98badd3a0e pkgtools/bootstrap-mk-files/files/mods/AIX.sys.mk
--- a/pkgtools/bootstrap-mk-files/files/mods/AIX.sys.mk Thu Sep 08 14:14:33 2016 +0000
+++ b/pkgtools/bootstrap-mk-files/files/mods/AIX.sys.mk Thu Sep 08 14:28:12 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: AIX.sys.mk,v 1.1 2008/07/03 20:06:21 joerg Exp $
+#      $NetBSD: AIX.sys.mk,v 1.2 2016/09/08 14:28:12 joerg Exp $
 #      @(#)sys.mk      8.2 (Berkeley) 3/21/94
 
 unix?=         We run Unix
@@ -24,20 +24,7 @@
 LINK.S?=       ${CC} ${AFLAGS} ${CPPFLAGS} ${LDFLAGS}
 
 CC?=           cc
-.if ${MACHINE_ARCH} == "alpha" || \
-    ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm26" || \
-               ${MACHINE_ARCH} == "arm32" || \
-    ${MACHINE_ARCH} == "i386" || \
-    ${MACHINE_ARCH} == "m68k" || \
-    ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb" || \
-    ${MACHINE_ARCH} == "sparc" || \
-    ${MACHINE_ARCH} == "vax"
-DBG?=  -O2
-.elif ${MACHINE_ARCH} == "x86_64"
-DBG?=
-.else
-DBG?=  -O
-.endif
+DBG?=          -O2
 CFLAGS?=       ${DBG}
 COMPILE.c?=    ${CC} ${CFLAGS} ${CPPFLAGS} -c
 LINK.c?=       ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}
diff -r cf536eafb977 -r ae98badd3a0e pkgtools/bootstrap-mk-files/files/mods/IRIX.sys.mk
--- a/pkgtools/bootstrap-mk-files/files/mods/IRIX.sys.mk        Thu Sep 08 14:14:33 2016 +0000
+++ b/pkgtools/bootstrap-mk-files/files/mods/IRIX.sys.mk        Thu Sep 08 14:28:12 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: IRIX.sys.mk,v 1.4 2011/08/29 10:43:35 cheusov Exp $
+#      $NetBSD: IRIX.sys.mk,v 1.5 2016/09/08 14:28:12 joerg Exp $
 #      @(#)sys.mk      8.2 (Berkeley) 3/21/94
 
 unix?=         We run Unix
@@ -22,7 +22,7 @@
 
 CC?=           cc
 NOGCCERROR?=   # defined
-DBG?=  -O2
+DBG?=          -O2
 CFLAGS?=       ${DBG}
 COMPILE.c?=    ${CC} ${CFLAGS} ${CPPFLAGS} -c
 LINK.c?=       ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}
diff -r cf536eafb977 -r ae98badd3a0e pkgtools/bootstrap-mk-files/files/mods/Linux.sys.mk
--- a/pkgtools/bootstrap-mk-files/files/mods/Linux.sys.mk       Thu Sep 08 14:14:33 2016 +0000
+++ b/pkgtools/bootstrap-mk-files/files/mods/Linux.sys.mk       Thu Sep 08 14:28:12 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Linux.sys.mk,v 1.6 2015/08/31 09:03:19 jperkin Exp $
+#      $NetBSD: Linux.sys.mk,v 1.7 2016/09/08 14:28:12 joerg Exp $
 #      NetBSD: sys.mk,v 1.58 2000/08/22 17:38:49 bjh21 Exp 
 #      @(#)sys.mk      8.2 (Berkeley) 3/21/94
 
@@ -25,20 +25,7 @@
 LINK.S?=       ${CC} ${AFLAGS} ${CPPFLAGS} ${LDFLAGS}
 
 CC?=           cc
-.if ${MACHINE_ARCH} == "alpha" || \
-    ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm26" || \
-               ${MACHINE_ARCH} == "arm32" || \
-    ${MACHINE_ARCH} == "i386" || \
-    ${MACHINE_ARCH} == "m68k" || \
-    ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb" || \
-    ${MACHINE_ARCH} == "sparc" || \
-    ${MACHINE_ARCH} == "vax"
-DBG?=  -O2
-.elif ${MACHINE_ARCH} == "x86_64"
-DBG?=
-.else
-DBG?=  -O
-.endif
+DBG?=          -O2
 CFLAGS?=       ${DBG}
 COMPILE.c?=    ${CC} ${CFLAGS} ${CPPFLAGS} -c
 LINK.c?=       ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}
diff -r cf536eafb977 -r ae98badd3a0e pkgtools/bootstrap-mk-files/files/mods/Minix.sys.mk
--- a/pkgtools/bootstrap-mk-files/files/mods/Minix.sys.mk       Thu Sep 08 14:14:33 2016 +0000
+++ b/pkgtools/bootstrap-mk-files/files/mods/Minix.sys.mk       Thu Sep 08 14:28:12 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Minix.sys.mk,v 1.3 2015/06/11 09:20:56 joerg Exp $
+#      $NetBSD: Minix.sys.mk,v 1.4 2016/09/08 14:28:12 joerg Exp $
 #      @(#)sys.mk      8.2 (Berkeley) 3/21/94
 
 unix?=         We run Unix.
@@ -21,7 +21,7 @@
 LINK.S?=       ${CC} ${AFLAGS} ${CPPFLAGS} ${LDFLAGS}
 
 CC?=           gcc
-DBG?=
+DBG?=          -O2
 CFLAGS?=       ${DBG}
 COMPILE.c?=    ${CC} ${CFLAGS} ${CPPFLAGS} -c
 LINK.c?=       ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}
diff -r cf536eafb977 -r ae98badd3a0e pkgtools/bootstrap-mk-files/files/mods/NetBSD.sys.mk
--- a/pkgtools/bootstrap-mk-files/files/mods/NetBSD.sys.mk      Thu Sep 08 14:14:33 2016 +0000
+++ b/pkgtools/bootstrap-mk-files/files/mods/NetBSD.sys.mk      Thu Sep 08 14:28:12 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: NetBSD.sys.mk,v 1.1.1.1 2006/07/14 23:13:01 jlam Exp $
+#      $NetBSD: NetBSD.sys.mk,v 1.2 2016/09/08 14:28:12 joerg Exp $
 #      @(#)sys.mk      8.2 (Berkeley) 3/21/94
 
 unix?=         We run NetBSD.
@@ -23,20 +23,7 @@
 LINK.S?=       ${CC} ${AFLAGS} ${CPPFLAGS} ${LDFLAGS}
 
 CC?=           cc
-.if ${MACHINE_ARCH} == "alpha" || \
-    ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm26" || \
-               ${MACHINE_ARCH} == "arm32" || \
-    ${MACHINE_ARCH} == "i386" || \
-    ${MACHINE_ARCH} == "m68k" || \
-    ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb" || \
-    ${MACHINE_ARCH} == "sparc" || \
-    ${MACHINE_ARCH} == "vax"
-DBG?=  -O2
-.elif ${MACHINE_ARCH} == "x86_64"
-DBG?=
-.else
-DBG?=  -O
-.endif
+DBG?=          -O2
 CFLAGS?=       ${DBG}
 COMPILE.c?=    ${CC} ${CFLAGS} ${CPPFLAGS} -c
 LINK.c?=       ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}
diff -r cf536eafb977 -r ae98badd3a0e pkgtools/bootstrap-mk-files/files/mods/OpenBSD.sys.mk
--- a/pkgtools/bootstrap-mk-files/files/mods/OpenBSD.sys.mk     Thu Sep 08 14:14:33 2016 +0000
+++ b/pkgtools/bootstrap-mk-files/files/mods/OpenBSD.sys.mk     Thu Sep 08 14:28:12 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: OpenBSD.sys.mk,v 1.1.1.1 2006/07/14 23:13:01 jlam Exp $
+#      $NetBSD: OpenBSD.sys.mk,v 1.2 2016/09/08 14:28:12 joerg Exp $
 #      @(#)sys.mk      8.2 (Berkeley) 3/21/94
 
 unix?=         We run OpenBSD.
@@ -23,15 +23,7 @@
 LINK.S?=       ${CC} ${AFLAGS} ${CPPFLAGS} ${LDFLAGS}
 
 CC?=           cc
-.if ${MACHINE_ARCH} == "alpha" || \
-    ${MACHINE_ARCH} == "i386" || \
-    ${MACHINE_ARCH} == "m68k" || \
-    ${MACHINE_ARCH} == "sparc" || \
-    ${MACHINE_ARCH} == "vax"
-DBG?=  -O2
-.else
-DBG?=  -O
-.endif
+DBG?=          -O2
 CFLAGS?=       ${DBG}
 COMPILE.c?=    ${CC} ${CFLAGS} ${CPPFLAGS} -c
 LINK.c?=       ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}
diff -r cf536eafb977 -r ae98badd3a0e pkgtools/bootstrap-mk-files/files/mods/QNX.sys.mk
--- a/pkgtools/bootstrap-mk-files/files/mods/QNX.sys.mk Thu Sep 08 14:14:33 2016 +0000
+++ b/pkgtools/bootstrap-mk-files/files/mods/QNX.sys.mk Thu Sep 08 14:28:12 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: QNX.sys.mk,v 1.1 2015/07/04 07:19:08 ryoon Exp $
+#      $NetBSD: QNX.sys.mk,v 1.2 2016/09/08 14:28:12 joerg Exp $
 #      @(#)sys.mk      8.2 (Berkeley) 3/21/94
 
 unix?=         We run Unix
@@ -24,20 +24,7 @@
 LINK.S?=       ${CC} ${AFLAGS} ${CPPFLAGS} ${LDFLAGS}
 
 CC?=           gcc
-.if ${MACHINE_ARCH} == "alpha" || \
-    ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm26" || \
-               ${MACHINE_ARCH} == "arm32" || \
-    ${MACHINE_ARCH} == "i386" || \
-    ${MACHINE_ARCH} == "m68k" || \
-    ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb" || \
-    ${MACHINE_ARCH} == "sparc" || \
-    ${MACHINE_ARCH} == "vax"
-DBG?=  -O2
-.elif ${MACHINE_ARCH} == "x86_64"
-DBG?=
-.else
-DBG?=  -O
-.endif
+DBG?=          -O2
 CFLAGS?=       ${DBG}
 COMPILE.c?=    ${CC} ${CFLAGS} ${CPPFLAGS} -c
 LINK.c?=       ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}
diff -r cf536eafb977 -r ae98badd3a0e pkgtools/bootstrap-mk-files/files/mods/SunOS.sys.mk
--- a/pkgtools/bootstrap-mk-files/files/mods/SunOS.sys.mk       Thu Sep 08 14:14:33 2016 +0000
+++ b/pkgtools/bootstrap-mk-files/files/mods/SunOS.sys.mk       Thu Sep 08 14:28:12 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: SunOS.sys.mk,v 1.7 2015/08/31 09:03:19 jperkin Exp $
+#      $NetBSD: SunOS.sys.mk,v 1.8 2016/09/08 14:28:12 joerg Exp $
 #      NetBSD: sys.mk,v 1.58 2000/08/22 17:38:49 bjh21 Exp 
 #      @(#)sys.mk      8.2 (Berkeley) 3/21/94
 
@@ -26,20 +26,7 @@
 
 # Unless told otherwise, assume GNU CC
 CC?=           gcc
-.if ${MACHINE_ARCH} == "alpha" || \
-    ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm26" || \
-               ${MACHINE_ARCH} == "arm32" || \
-    ${MACHINE_ARCH} == "i386" || \
-    ${MACHINE_ARCH} == "m68k" || \
-    ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb" || \
-    ${MACHINE_ARCH} == "sparc" || \
-    ${MACHINE_ARCH} == "vax"
-DBG?=  -O2
-.elif ${MACHINE_ARCH} == "x86_64"
-DBG?=
-.else
-DBG?=  -O
-.endif
+DBG?=          -O2
 CFLAGS?=       ${DBG}
 COMPILE.c?=    ${CC} ${CFLAGS} ${CPPFLAGS} -c
 LINK.c?=       ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}
diff -r cf536eafb977 -r ae98badd3a0e pkgtools/bootstrap-mk-files/files/sys.mk
--- a/pkgtools/bootstrap-mk-files/files/sys.mk  Thu Sep 08 14:14:33 2016 +0000
+++ b/pkgtools/bootstrap-mk-files/files/sys.mk  Thu Sep 08 14:28:12 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: sys.mk,v 1.1.1.1 2006/07/14 23:13:01 jlam Exp $
+#      $NetBSD: sys.mk,v 1.2 2016/09/08 14:28:12 joerg Exp $
 #      @(#)sys.mk      8.2 (Berkeley) 3/21/94
 
 unix?=         We run Unix
@@ -24,20 +24,7 @@
 LINK.S?=       ${CC} ${AFLAGS} ${CPPFLAGS} ${LDFLAGS}
 
 CC?=           cc
-.if ${MACHINE_ARCH} == "alpha" || \
-    ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm26" || \
-               ${MACHINE_ARCH} == "arm32" || \
-    ${MACHINE_ARCH} == "i386" || \
-    ${MACHINE_ARCH} == "m68k" || \
-    ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb" || \
-    ${MACHINE_ARCH} == "sparc" || \
-    ${MACHINE_ARCH} == "vax"
-DBG?=  -O2
-.elif ${MACHINE_ARCH} == "x86_64"
-DBG?=
-.else
-DBG?=  -O
-.endif
+DBG?=          -O2
 CFLAGS?=       ${DBG}
 COMPILE.c?=    ${CC} ${CFLAGS} ${CPPFLAGS} -c
 LINK.c?=       ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}