Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-8]: src/tools Pull up following revision(s) (requested by christo...



details:   https://anonhg.NetBSD.org/src/rev/17f461426005
branches:  netbsd-8
changeset: 434960:17f461426005
user:      martin <martin%NetBSD.org@localhost>
date:      Sat May 05 19:25:55 2018 +0000

description:
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

diffstat:

 tools/Makefile.host       |  3 ++-
 tools/Makefile.inc        |  3 +++
 tools/binstall/Makefile   |  4 ++--
 tools/binutils/Makefile   |  4 ++--
 tools/compat/Makefile     |  4 ++--
 tools/ctfconvert/Makefile |  4 ++--
 tools/ctfmerge/Makefile   |  4 ++--
 tools/cvslatest/Makefile  |  4 ++--
 tools/dbsym/Makefile      |  4 ++--
 tools/dtc/Makefile        |  4 ++--
 tools/gcc/Makefile        |  4 ++--
 tools/gdb/Makefile        |  4 ++--
 tools/genassym/Makefile   |  4 ++--
 tools/gettext/Makefile    |  4 ++--
 tools/libctf/Makefile     |  4 ++--
 tools/libdwarf/Makefile   |  4 ++--
 tools/libelf/Makefile     |  4 ++--
 tools/libfdt/Makefile     |  4 ++--
 tools/lorder/Makefile     |  4 ++--
 tools/makekeys/Makefile   |  4 ++--
 tools/mandoc/Makefile     |  4 ++--
 tools/mdsetimage/Makefile |  4 ++--
 22 files changed, 45 insertions(+), 41 deletions(-)

diffs (291 lines):

diff -r d1720895b0e1 -r 17f461426005 tools/Makefile.host
--- a/tools/Makefile.host       Sat May 05 19:15:55 2018 +0000
+++ b/tools/Makefile.host       Sat May 05 19:25:55 2018 +0000
@@ -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>
 
diff -r d1720895b0e1 -r 17f461426005 tools/Makefile.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tools/Makefile.inc        Sat May 05 19:25:55 2018 +0000
@@ -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
diff -r d1720895b0e1 -r 17f461426005 tools/binstall/Makefile
--- a/tools/binstall/Makefile   Sat May 05 19:15:55 2018 +0000
+++ b/tools/binstall/Makefile   Sat May 05 19:25:55 2018 +0000
@@ -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
diff -r d1720895b0e1 -r 17f461426005 tools/binutils/Makefile
--- a/tools/binutils/Makefile   Sat May 05 19:15:55 2018 +0000
+++ b/tools/binutils/Makefile   Sat May 05 19:25:55 2018 +0000
@@ -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
 
diff -r d1720895b0e1 -r 17f461426005 tools/compat/Makefile
--- a/tools/compat/Makefile     Sat May 05 19:15:55 2018 +0000
+++ b/tools/compat/Makefile     Sat May 05 19:25:55 2018 +0000
@@ -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 \
diff -r d1720895b0e1 -r 17f461426005 tools/ctfconvert/Makefile
--- a/tools/ctfconvert/Makefile Sat May 05 19:15:55 2018 +0000
+++ b/tools/ctfconvert/Makefile Sat May 05 19:25:55 2018 +0000
@@ -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
diff -r d1720895b0e1 -r 17f461426005 tools/ctfmerge/Makefile
--- a/tools/ctfmerge/Makefile   Sat May 05 19:15:55 2018 +0000
+++ b/tools/ctfmerge/Makefile   Sat May 05 19:25:55 2018 +0000
@@ -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
diff -r d1720895b0e1 -r 17f461426005 tools/cvslatest/Makefile
--- a/tools/cvslatest/Makefile  Sat May 05 19:15:55 2018 +0000
+++ b/tools/cvslatest/Makefile  Sat May 05 19:25:55 2018 +0000
@@ -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
diff -r d1720895b0e1 -r 17f461426005 tools/dbsym/Makefile
--- a/tools/dbsym/Makefile      Sat May 05 19:15:55 2018 +0000
+++ b/tools/dbsym/Makefile      Sat May 05 19:25:55 2018 +0000
@@ -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
 
diff -r d1720895b0e1 -r 17f461426005 tools/dtc/Makefile
--- a/tools/dtc/Makefile        Sat May 05 19:15:55 2018 +0000
+++ b/tools/dtc/Makefile        Sat May 05 19:25:55 2018 +0000
@@ -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}
diff -r d1720895b0e1 -r 17f461426005 tools/gcc/Makefile
--- a/tools/gcc/Makefile        Sat May 05 19:15:55 2018 +0000
+++ b/tools/gcc/Makefile        Sat May 05 19:25:55 2018 +0000
@@ -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
diff -r d1720895b0e1 -r 17f461426005 tools/gdb/Makefile
--- a/tools/gdb/Makefile        Sat May 05 19:15:55 2018 +0000
+++ b/tools/gdb/Makefile        Sat May 05 19:25:55 2018 +0000
@@ -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}
diff -r d1720895b0e1 -r 17f461426005 tools/genassym/Makefile
--- a/tools/genassym/Makefile   Sat May 05 19:15:55 2018 +0000
+++ b/tools/genassym/Makefile   Sat May 05 19:25:55 2018 +0000
@@ -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
 
diff -r d1720895b0e1 -r 17f461426005 tools/gettext/Makefile
--- a/tools/gettext/Makefile    Sat May 05 19:15:55 2018 +0000
+++ b/tools/gettext/Makefile    Sat May 05 19:25:55 2018 +0000
@@ -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
 
diff -r d1720895b0e1 -r 17f461426005 tools/libctf/Makefile
--- a/tools/libctf/Makefile     Sat May 05 19:15:55 2018 +0000
+++ b/tools/libctf/Makefile     Sat May 05 19:25:55 2018 +0000
@@ -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 \
diff -r d1720895b0e1 -r 17f461426005 tools/libdwarf/Makefile
--- a/tools/libdwarf/Makefile   Sat May 05 19:15:55 2018 +0000
+++ b/tools/libdwarf/Makefile   Sat May 05 19:25:55 2018 +0000
@@ -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  \
diff -r d1720895b0e1 -r 17f461426005 tools/libelf/Makefile
--- a/tools/libelf/Makefile     Sat May 05 19:15:55 2018 +0000
+++ b/tools/libelf/Makefile     Sat May 05 19:25:55 2018 +0000
@@ -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                                              \
diff -r d1720895b0e1 -r 17f461426005 tools/libfdt/Makefile
--- a/tools/libfdt/Makefile     Sat May 05 19:15:55 2018 +0000
+++ b/tools/libfdt/Makefile     Sat May 05 19:25:55 2018 +0000
@@ -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
 
diff -r d1720895b0e1 -r 17f461426005 tools/lorder/Makefile
--- a/tools/lorder/Makefile     Sat May 05 19:15:55 2018 +0000
+++ b/tools/lorder/Makefile     Sat May 05 19:25:55 2018 +0000
@@ -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"
 
diff -r d1720895b0e1 -r 17f461426005 tools/makekeys/Makefile
--- a/tools/makekeys/Makefile   Sat May 05 19:15:55 2018 +0000
+++ b/tools/makekeys/Makefile   Sat May 05 19:25:55 2018 +0000
@@ -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
diff -r d1720895b0e1 -r 17f461426005 tools/mandoc/Makefile
--- a/tools/mandoc/Makefile     Sat May 05 19:15:55 2018 +0000
+++ b/tools/mandoc/Makefile     Sat May 05 19:25:55 2018 +0000
@@ -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}"
diff -r d1720895b0e1 -r 17f461426005 tools/mdsetimage/Makefile
--- a/tools/mdsetimage/Makefile Sat May 05 19:15:55 2018 +0000
+++ b/tools/mdsetimage/Makefile Sat May 05 19:25:55 2018 +0000
@@ -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
 



Home | Main Index | Thread Index | Old Index