Module Name: src
Committed By: martin
Date: Sat May 5 19:25:57 UTC 2018
Modified Files:
src/tools [netbsd-8]: Makefile.host
src/tools/binstall [netbsd-8]: Makefile
src/tools/binutils [netbsd-8]: Makefile
src/tools/compat [netbsd-8]: Makefile
src/tools/ctfconvert [netbsd-8]: Makefile
src/tools/ctfmerge [netbsd-8]: Makefile
src/tools/cvslatest [netbsd-8]: Makefile
src/tools/dbsym [netbsd-8]: Makefile
src/tools/dtc [netbsd-8]: Makefile
src/tools/gcc [netbsd-8]: Makefile
src/tools/gdb [netbsd-8]: Makefile
src/tools/genassym [netbsd-8]: Makefile
src/tools/gettext [netbsd-8]: Makefile
src/tools/libctf [netbsd-8]: Makefile
src/tools/libdwarf [netbsd-8]: Makefile
src/tools/libelf [netbsd-8]: Makefile
src/tools/libfdt [netbsd-8]: Makefile
src/tools/lorder [netbsd-8]: Makefile
src/tools/makekeys [netbsd-8]: Makefile
src/tools/mandoc [netbsd-8]: Makefile
src/tools/mdsetimage [netbsd-8]: Makefile
Added Files:
src/tools [netbsd-8]: Makefile.inc
Log Message:
Pull up following revision(s) (requested by christos in ticket #796):
tools/mdsetimage/Makefile: revision 1.15
tools/compat/Makefile: revision 1.82
tools/gdb/Makefile: revision 1.35
tools/lorder/Makefile: revision 1.13
tools/gcc/Makefile: revision 1.85
tools/dtc/Makefile: revision 1.3
tools/cvslatest/Makefile: revision 1.2
tools/ctfmerge/Makefile: revision 1.8
tools/libelf/Makefile: revision 1.9
tools/libdwarf/Makefile: revision 1.8
tools/ctfconvert/Makefile: revision 1.7
tools/makekeys/Makefile: revision 1.2
tools/gettext/Makefile: revision 1.7
tools/binstall/Makefile: revision 1.12
tools/libfdt/Makefile: revision 1.3
tools/libctf/Makefile: revision 1.7
tools/binutils/Makefile: revision 1.27
tools/mandoc/Makefile: revision 1.11
tools/Makefile.host: revision 1.32
tools/dbsym/Makefile: revision 1.13
tools/genassym/Makefile: revision 1.7
tools/Makefile.inc: revision 1.14
PR/53238: Robert Elz: Disable MKREPRO in tools; the host compiler might
not support the necessary options. This is done thusly:
1. Set MKREPRO=no in Makefile.host. This handles all the Makefiles that
use it and don't include bsd.own.mk.
2. Create Makefile.inc and set MKREPRO=no in it. Change the Makefiles that
include bsd.own.mk, to include bsd.init.mk which includes Makefile.inc
first. This will also allow us to control other tools options from a
single location if we need to.
XXX: pullup-8
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.31.20.1 src/tools/Makefile.host
cvs rdiff -u -r0 -r1.16.2.2 src/tools/Makefile.inc
cvs rdiff -u -r1.11 -r1.11.22.1 src/tools/binstall/Makefile
cvs rdiff -u -r1.26 -r1.26.6.1 src/tools/binutils/Makefile
cvs rdiff -u -r1.81 -r1.81.8.1 src/tools/compat/Makefile
cvs rdiff -u -r1.6 -r1.6.8.1 src/tools/ctfconvert/Makefile
cvs rdiff -u -r1.7 -r1.7.8.1 src/tools/ctfmerge/Makefile
cvs rdiff -u -r1.1 -r1.1.8.1 src/tools/cvslatest/Makefile
cvs rdiff -u -r1.11 -r1.11.6.1 src/tools/dbsym/Makefile
cvs rdiff -u -r1.2.4.2 -r1.2.4.3 src/tools/dtc/Makefile
cvs rdiff -u -r1.81.4.1 -r1.81.4.2 src/tools/gcc/Makefile
cvs rdiff -u -r1.30 -r1.30.6.1 src/tools/gdb/Makefile
cvs rdiff -u -r1.6 -r1.6.22.1 src/tools/genassym/Makefile
cvs rdiff -u -r1.6 -r1.6.22.1 src/tools/gettext/Makefile
cvs rdiff -u -r1.6 -r1.6.8.1 src/tools/libctf/Makefile
cvs rdiff -u -r1.7 -r1.7.18.1 src/tools/libdwarf/Makefile
cvs rdiff -u -r1.8 -r1.8.18.1 src/tools/libelf/Makefile
cvs rdiff -u -r1.2.4.2 -r1.2.4.3 src/tools/libfdt/Makefile
cvs rdiff -u -r1.12 -r1.12.22.1 src/tools/lorder/Makefile
cvs rdiff -u -r1.1 -r1.1.8.1 src/tools/makekeys/Makefile
cvs rdiff -u -r1.9.8.1 -r1.9.8.2 src/tools/mandoc/Makefile
cvs rdiff -u -r1.13 -r1.13.6.1 src/tools/mdsetimage/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/Makefile.host
diff -u src/tools/Makefile.host:1.31 src/tools/Makefile.host:1.31.20.1
--- src/tools/Makefile.host:1.31 Fri Jun 14 16:10:02 2013
+++ src/tools/Makefile.host Sat May 5 19:25:56 2018
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile.host,v 1.31 2013/06/14 16:10:02 tsutsui Exp $
+# $NetBSD: Makefile.host,v 1.31.20.1 2018/05/05 19:25:56 martin Exp $
NOINFO= # defined
NOLINT= # defined
NOMAN= # defined
+MKREPRO=no # Native toolchain might be unable to do it
.include <bsd.own.mk>
Index: src/tools/binstall/Makefile
diff -u src/tools/binstall/Makefile:1.11 src/tools/binstall/Makefile:1.11.22.1
--- src/tools/binstall/Makefile:1.11 Sat Mar 16 22:32:50 2013
+++ src/tools/binstall/Makefile Sat May 5 19:25:56 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2013/03/16 22:32:50 christos Exp $
+# $NetBSD: Makefile,v 1.11.22.1 2018/05/05 19:25:56 martin Exp $
NOMAN=
-.include <bsd.own.mk>
+.include <bsd.init.mk>
HOSTPROGNAME= ${MACHINE_GNU_PLATFORM}-install
HOST_SRCDIR= usr.bin/xinstall
Index: src/tools/binutils/Makefile
diff -u src/tools/binutils/Makefile:1.26 src/tools/binutils/Makefile:1.26.6.1
--- src/tools/binutils/Makefile:1.26 Tue Oct 11 03:57:00 2016
+++ src/tools/binutils/Makefile Sat May 5 19:25:56 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2016/10/11 03:57:00 mrg Exp $
+# $NetBSD: Makefile,v 1.26.6.1 2018/05/05 19:25:56 martin Exp $
-.include <bsd.own.mk>
+.include <bsd.init.mk>
MODULE= binutils
Index: src/tools/compat/Makefile
diff -u src/tools/compat/Makefile:1.81 src/tools/compat/Makefile:1.81.8.1
--- src/tools/compat/Makefile:1.81 Sun Mar 6 10:19:01 2016
+++ src/tools/compat/Makefile Sat May 5 19:25:55 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.81 2016/03/06 10:19:01 aymeric Exp $
+# $NetBSD: Makefile,v 1.81.8.1 2018/05/05 19:25:55 martin Exp $
HOSTLIB= nbcompat
-.include <bsd.own.mk>
+.include <bsd.init.mk>
SRCS= atoll.c basename.c cdbr.c cdbw.c dirname.c \
dprintf.c fgetln.c flock.c fparseln.c fpurge.c \
Index: src/tools/ctfconvert/Makefile
diff -u src/tools/ctfconvert/Makefile:1.6 src/tools/ctfconvert/Makefile:1.6.8.1
--- src/tools/ctfconvert/Makefile:1.6 Thu Mar 17 18:43:29 2016
+++ src/tools/ctfconvert/Makefile Sat May 5 19:25:56 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2016/03/17 18:43:29 christos Exp $
+# $NetBSD: Makefile,v 1.6.8.1 2018/05/05 19:25:56 martin Exp $
NOMAN= # defined
-.include <bsd.own.mk>
+.include <bsd.init.mk>
HOSTPROGNAME= ${_TOOL_PREFIX}ctfconvert
HOST_SRCDIR= external/cddl/osnet/usr.bin/ctfconvert
Index: src/tools/ctfmerge/Makefile
diff -u src/tools/ctfmerge/Makefile:1.7 src/tools/ctfmerge/Makefile:1.7.8.1
--- src/tools/ctfmerge/Makefile:1.7 Wed Jan 27 21:18:28 2016
+++ src/tools/ctfmerge/Makefile Sat May 5 19:25:55 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2016/01/27 21:18:28 christos Exp $
+# $NetBSD: Makefile,v 1.7.8.1 2018/05/05 19:25:55 martin Exp $
NOMAN= # defined
-.include <bsd.own.mk>
+.include <bsd.init.mk>
HOSTPROGNAME= ${_TOOL_PREFIX}ctfmerge
HOST_SRCDIR= external/cddl/osnet/usr.bin/ctfmerge
Index: src/tools/cvslatest/Makefile
diff -u src/tools/cvslatest/Makefile:1.1 src/tools/cvslatest/Makefile:1.1.8.1
--- src/tools/cvslatest/Makefile:1.1 Sun Jan 24 20:14:18 2016
+++ src/tools/cvslatest/Makefile Sat May 5 19:25:55 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2016/01/24 20:14:18 christos Exp $
+# $NetBSD: Makefile,v 1.1.8.1 2018/05/05 19:25:55 martin Exp $
NOMAN= # defined
-.include <bsd.own.mk>
+.include <bsd.init.mk>
HOSTPROGNAME= ${_TOOL_PREFIX}cvslatest
HOST_SRCDIR= usr.bin/cvslatest
Index: src/tools/dbsym/Makefile
diff -u src/tools/dbsym/Makefile:1.11 src/tools/dbsym/Makefile:1.11.6.1
--- src/tools/dbsym/Makefile:1.11 Fri Jan 6 20:27:19 2017
+++ src/tools/dbsym/Makefile Sat May 5 19:25:57 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2017/01/06 20:27:19 christos Exp $
+# $NetBSD: Makefile,v 1.11.6.1 2018/05/05 19:25:57 martin Exp $
NOMAN= # defined
-.include <bsd.own.mk>
+.include <bsd.init.mk>
HOSTPROGNAME= ${MACHINE_GNU_PLATFORM}-dbsym
Index: src/tools/dtc/Makefile
diff -u src/tools/dtc/Makefile:1.2.4.2 src/tools/dtc/Makefile:1.2.4.3
--- src/tools/dtc/Makefile:1.2.4.2 Tue Jul 18 17:32:50 2017
+++ src/tools/dtc/Makefile Sat May 5 19:25:55 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2.4.2 2017/07/18 17:32:50 snj Exp $
+# $NetBSD: Makefile,v 1.2.4.3 2018/05/05 19:25:55 martin Exp $
NOMAN= # defined
-.include <bsd.own.mk>
+.include <bsd.init.mk>
LIBFDT_DIR= ${.CURDIR}/../../sys/external/bsd/libfdt/dist
HOST_CPPFLAGS+= -I${LIBFDT_DIR}
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.81.4.1 src/tools/gcc/Makefile:1.81.4.2
--- src/tools/gcc/Makefile:1.81.4.1 Mon Oct 9 17:59:16 2017
+++ src/tools/gcc/Makefile Sat May 5 19:25:55 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.81.4.1 2017/10/09 17:59:16 snj Exp $
+# $NetBSD: Makefile,v 1.81.4.2 2018/05/05 19:25:55 martin Exp $
-.include <bsd.own.mk>
+.include <bsd.init.mk>
GCC_LANGUAGES=c c++ objc
MODULE= gcc4
Index: src/tools/gdb/Makefile
diff -u src/tools/gdb/Makefile:1.30 src/tools/gdb/Makefile:1.30.6.1
--- src/tools/gdb/Makefile:1.30 Sun Oct 16 04:37:42 2016
+++ src/tools/gdb/Makefile Sat May 5 19:25:55 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.30 2016/10/16 04:37:42 mrg Exp $
+# $NetBSD: Makefile,v 1.30.6.1 2018/05/05 19:25:55 martin Exp $
-.include <bsd.own.mk>
+.include <bsd.init.mk>
MODULE= gdb
GDBDIR= ${.CURDIR}/../../external/gpl3/${EXTERNAL_GDB_SUBDIR}
Index: src/tools/genassym/Makefile
diff -u src/tools/genassym/Makefile:1.6 src/tools/genassym/Makefile:1.6.22.1
--- src/tools/genassym/Makefile:1.6 Sun Dec 2 12:48:32 2012
+++ src/tools/genassym/Makefile Sat May 5 19:25:57 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2012/12/02 12:48:32 apb Exp $
+# $NetBSD: Makefile,v 1.6.22.1 2018/05/05 19:25:57 martin Exp $
-.include <bsd.own.mk>
+.include <bsd.init.mk>
.PATH.sh: ${.CURDIR}/../../usr.bin/genassym
Index: src/tools/gettext/Makefile
diff -u src/tools/gettext/Makefile:1.6 src/tools/gettext/Makefile:1.6.22.1
--- src/tools/gettext/Makefile:1.6 Wed Mar 6 14:34:01 2013
+++ src/tools/gettext/Makefile Sat May 5 19:25:56 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2013/03/06 14:34:01 apb Exp $
+# $NetBSD: Makefile,v 1.6.22.1 2018/05/05 19:25:56 martin Exp $
-.include <bsd.own.mk>
+.include <bsd.init.mk>
MODULE= gettext
Index: src/tools/libctf/Makefile
diff -u src/tools/libctf/Makefile:1.6 src/tools/libctf/Makefile:1.6.8.1
--- src/tools/libctf/Makefile:1.6 Sun Dec 27 21:37:50 2015
+++ src/tools/libctf/Makefile Sat May 5 19:25:56 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2015/12/27 21:37:50 christos Exp $
+# $NetBSD: Makefile,v 1.6.8.1 2018/05/05 19:25:56 martin Exp $
HOSTLIB= ctf
-.include <bsd.own.mk>
+.include <bsd.init.mk>
SRCS= ctf_create.c \
ctf_decl.c \
Index: src/tools/libdwarf/Makefile
diff -u src/tools/libdwarf/Makefile:1.7 src/tools/libdwarf/Makefile:1.7.18.1
--- src/tools/libdwarf/Makefile:1.7 Sun Mar 9 17:10:38 2014
+++ src/tools/libdwarf/Makefile Sat May 5 19:25:56 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2014/03/09 17:10:38 christos Exp $
+# $NetBSD: Makefile,v 1.7.18.1 2018/05/05 19:25:56 martin Exp $
HOSTLIB=dwarf
-.include <bsd.own.mk>
+.include <bsd.init.mk>
SRCS= \
dwarf_abbrev.c \
Index: src/tools/libelf/Makefile
diff -u src/tools/libelf/Makefile:1.8 src/tools/libelf/Makefile:1.8.18.1
--- src/tools/libelf/Makefile:1.8 Sun Mar 9 17:10:12 2014
+++ src/tools/libelf/Makefile Sat May 5 19:25:56 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2014/03/09 17:10:12 christos Exp $
+# $NetBSD: Makefile,v 1.8.18.1 2018/05/05 19:25:56 martin Exp $
HOSTLIB= elf
-.include <bsd.own.mk>
+.include <bsd.init.mk>
SRCS= elf_begin.c \
elf_cntl.c \
Index: src/tools/libfdt/Makefile
diff -u src/tools/libfdt/Makefile:1.2.4.2 src/tools/libfdt/Makefile:1.2.4.3
--- src/tools/libfdt/Makefile:1.2.4.2 Tue Jul 18 17:32:50 2017
+++ src/tools/libfdt/Makefile Sat May 5 19:25:56 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2.4.2 2017/07/18 17:32:50 snj Exp $
+# $NetBSD: Makefile,v 1.2.4.3 2018/05/05 19:25:56 martin Exp $
HOSTLIB= fdt
-.include <bsd.own.mk>
+.include <bsd.init.mk>
LIBFDT_DIR= ${.CURDIR}/../../sys/external/bsd/libfdt/dist
Index: src/tools/lorder/Makefile
diff -u src/tools/lorder/Makefile:1.12 src/tools/lorder/Makefile:1.12.22.1
--- src/tools/lorder/Makefile:1.12 Sun Dec 2 12:48:33 2012
+++ src/tools/lorder/Makefile Sat May 5 19:25:55 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2012/12/02 12:48:33 apb Exp $
+# $NetBSD: Makefile,v 1.12.22.1 2018/05/05 19:25:55 martin Exp $
-.include <bsd.own.mk>
+.include <bsd.init.mk>
.-include "${TOOLDIR}/share/compat/defs.mk"
Index: src/tools/makekeys/Makefile
diff -u src/tools/makekeys/Makefile:1.1 src/tools/makekeys/Makefile:1.1.8.1
--- src/tools/makekeys/Makefile:1.1 Wed Jun 24 22:20:26 2015
+++ src/tools/makekeys/Makefile Sat May 5 19:25:56 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2015/06/24 22:20:26 matt Exp $
+# $NetBSD: Makefile,v 1.1.8.1 2018/05/05 19:25:56 martin Exp $
#NOMAN=
-#.include <bsd.own.mk>
+#.include <bsd.init.mk>
HOSTPROG= ${_TOOL_PREFIX}makekeys
HOST_SRCDIR= external/mit/xorg/tools/makekeys
Index: src/tools/mandoc/Makefile
diff -u src/tools/mandoc/Makefile:1.9.8.1 src/tools/mandoc/Makefile:1.9.8.2
--- src/tools/mandoc/Makefile:1.9.8.1 Tue Mar 13 13:29:57 2018
+++ src/tools/mandoc/Makefile Sat May 5 19:25:56 2018
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.9.8.1 2018/03/13 13:29:57 martin Exp $
+# $NetBSD: Makefile,v 1.9.8.2 2018/05/05 19:25:56 martin Exp $
HOSTPROGNAME= ${_TOOL_PREFIX}mandoc
HOST_SRCDIR= external/bsd/mdocml/bin/mandoc
NOMAN= # defined
-.include <bsd.own.mk>
+.include <bsd.init.mk>
NETBSD_MINOR!= ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh -n
NETBSD_OSNAME= "NetBSD ${NETBSD_MINOR}"
Index: src/tools/mdsetimage/Makefile
diff -u src/tools/mdsetimage/Makefile:1.13 src/tools/mdsetimage/Makefile:1.13.6.1
--- src/tools/mdsetimage/Makefile:1.13 Fri Jan 6 20:27:19 2017
+++ src/tools/mdsetimage/Makefile Sat May 5 19:25:55 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2017/01/06 20:27:19 christos Exp $
+# $NetBSD: Makefile,v 1.13.6.1 2018/05/05 19:25:55 martin Exp $
NOMAN= # defined
-.include <bsd.own.mk>
+.include <bsd.init.mk>
HOSTPROGNAME= ${MACHINE_GNU_PLATFORM}-mdsetimage
Added files:
Index: src/tools/Makefile.inc
diff -u /dev/null src/tools/Makefile.inc:1.16.2.2
--- /dev/null Sat May 5 19:25:57 2018
+++ src/tools/Makefile.inc Sat May 5 19:25:56 2018
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.inc,v 1.16.2.2 2018/05/05 19:25:56 martin Exp $
+
+MKREPRO=no # Native toolchain might be unable to do it
