Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/tools PR/53238: Robert Elz: Disable MKREPRO in ...
details: https://anonhg.NetBSD.org/src/rev/e366a9460c93
branches: trunk
changeset: 318594:e366a9460c93
user: christos <christos%NetBSD.org@localhost>
date: Tue May 01 00:04:34 2018 +0000
description:
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 0e01793730a7 -r e366a9460c93 tools/Makefile.host
--- a/tools/Makefile.host Mon Apr 30 22:17:46 2018 +0000
+++ b/tools/Makefile.host Tue May 01 00:04:34 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.32 2018/05/01 00:04:34 christos Exp $
NOINFO= # defined
NOLINT= # defined
NOMAN= # defined
+MKREPRO=no # Native toolchain might be unable to do it
.include <bsd.own.mk>
diff -r 0e01793730a7 -r e366a9460c93 tools/Makefile.inc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tools/Makefile.inc Tue May 01 00:04:34 2018 +0000
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.inc,v 1.14 2018/05/01 00:04:34 christos Exp $
+
+MKREPRO=no # Native toolchain might be unable to do it
diff -r 0e01793730a7 -r e366a9460c93 tools/binstall/Makefile
--- a/tools/binstall/Makefile Mon Apr 30 22:17:46 2018 +0000
+++ b/tools/binstall/Makefile Tue May 01 00:04:34 2018 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2013/03/16 22:32:50 christos Exp $
+# $NetBSD: Makefile,v 1.12 2018/05/01 00:04:34 christos Exp $
NOMAN=
-.include <bsd.own.mk>
+.include <bsd.init.mk>
HOSTPROGNAME= ${MACHINE_GNU_PLATFORM}-install
HOST_SRCDIR= usr.bin/xinstall
diff -r 0e01793730a7 -r e366a9460c93 tools/binutils/Makefile
--- a/tools/binutils/Makefile Mon Apr 30 22:17:46 2018 +0000
+++ b/tools/binutils/Makefile Tue May 01 00:04:34 2018 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2016/10/11 03:57:00 mrg Exp $
+# $NetBSD: Makefile,v 1.27 2018/05/01 00:04:34 christos Exp $
-.include <bsd.own.mk>
+.include <bsd.init.mk>
MODULE= binutils
diff -r 0e01793730a7 -r e366a9460c93 tools/compat/Makefile
--- a/tools/compat/Makefile Mon Apr 30 22:17:46 2018 +0000
+++ b/tools/compat/Makefile Tue May 01 00:04:34 2018 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.81 2016/03/06 10:19:01 aymeric Exp $
+# $NetBSD: Makefile,v 1.82 2018/05/01 00:04:35 christos 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 0e01793730a7 -r e366a9460c93 tools/ctfconvert/Makefile
--- a/tools/ctfconvert/Makefile Mon Apr 30 22:17:46 2018 +0000
+++ b/tools/ctfconvert/Makefile Tue May 01 00:04:34 2018 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2016/03/17 18:43:29 christos Exp $
+# $NetBSD: Makefile,v 1.7 2018/05/01 00:04:35 christos 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 0e01793730a7 -r e366a9460c93 tools/ctfmerge/Makefile
--- a/tools/ctfmerge/Makefile Mon Apr 30 22:17:46 2018 +0000
+++ b/tools/ctfmerge/Makefile Tue May 01 00:04:34 2018 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2016/01/27 21:18:28 christos Exp $
+# $NetBSD: Makefile,v 1.8 2018/05/01 00:04:35 christos 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 0e01793730a7 -r e366a9460c93 tools/cvslatest/Makefile
--- a/tools/cvslatest/Makefile Mon Apr 30 22:17:46 2018 +0000
+++ b/tools/cvslatest/Makefile Tue May 01 00:04:34 2018 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2016/01/24 20:14:18 christos Exp $
+# $NetBSD: Makefile,v 1.2 2018/05/01 00:04:35 christos Exp $
NOMAN= # defined
-.include <bsd.own.mk>
+.include <bsd.init.mk>
HOSTPROGNAME= ${_TOOL_PREFIX}cvslatest
HOST_SRCDIR= usr.bin/cvslatest
diff -r 0e01793730a7 -r e366a9460c93 tools/dbsym/Makefile
--- a/tools/dbsym/Makefile Mon Apr 30 22:17:46 2018 +0000
+++ b/tools/dbsym/Makefile Tue May 01 00:04:34 2018 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2017/12/27 21:34:11 christos Exp $
+# $NetBSD: Makefile,v 1.13 2018/05/01 00:04:35 christos Exp $
NOMAN= # defined
-.include <bsd.own.mk>
+.include <bsd.init.mk>
HOSTPROGNAME= ${MACHINE_GNU_PLATFORM}-dbsym
diff -r 0e01793730a7 -r e366a9460c93 tools/dtc/Makefile
--- a/tools/dtc/Makefile Mon Apr 30 22:17:46 2018 +0000
+++ b/tools/dtc/Makefile Tue May 01 00:04:34 2018 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2017/06/08 17:16:44 skrll Exp $
+# $NetBSD: Makefile,v 1.3 2018/05/01 00:04:35 christos 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 0e01793730a7 -r e366a9460c93 tools/gcc/Makefile
--- a/tools/gcc/Makefile Mon Apr 30 22:17:46 2018 +0000
+++ b/tools/gcc/Makefile Tue May 01 00:04:34 2018 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.84 2018/02/02 01:02:41 mrg Exp $
+# $NetBSD: Makefile,v 1.85 2018/05/01 00:04:35 christos Exp $
-.include <bsd.own.mk>
+.include <bsd.init.mk>
GCC_LANGUAGES=c c++ objc
MODULE= gcc4
diff -r 0e01793730a7 -r e366a9460c93 tools/gdb/Makefile
--- a/tools/gdb/Makefile Mon Apr 30 22:17:46 2018 +0000
+++ b/tools/gdb/Makefile Tue May 01 00:04:34 2018 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2017/11/29 04:24:35 christos Exp $
+# $NetBSD: Makefile,v 1.35 2018/05/01 00:04:35 christos Exp $
-.include <bsd.own.mk>
+.include <bsd.init.mk>
MODULE= gdb
GDBDIR= ${.CURDIR}/../../external/gpl3/${EXTERNAL_GDB_SUBDIR}
diff -r 0e01793730a7 -r e366a9460c93 tools/genassym/Makefile
--- a/tools/genassym/Makefile Mon Apr 30 22:17:46 2018 +0000
+++ b/tools/genassym/Makefile Tue May 01 00:04:34 2018 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2012/12/02 12:48:32 apb Exp $
+# $NetBSD: Makefile,v 1.7 2018/05/01 00:04:35 christos Exp $
-.include <bsd.own.mk>
+.include <bsd.init.mk>
.PATH.sh: ${.CURDIR}/../../usr.bin/genassym
diff -r 0e01793730a7 -r e366a9460c93 tools/gettext/Makefile
--- a/tools/gettext/Makefile Mon Apr 30 22:17:46 2018 +0000
+++ b/tools/gettext/Makefile Tue May 01 00:04:34 2018 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2013/03/06 14:34:01 apb Exp $
+# $NetBSD: Makefile,v 1.7 2018/05/01 00:04:35 christos Exp $
-.include <bsd.own.mk>
+.include <bsd.init.mk>
MODULE= gettext
diff -r 0e01793730a7 -r e366a9460c93 tools/libctf/Makefile
--- a/tools/libctf/Makefile Mon Apr 30 22:17:46 2018 +0000
+++ b/tools/libctf/Makefile Tue May 01 00:04:34 2018 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2015/12/27 21:37:50 christos Exp $
+# $NetBSD: Makefile,v 1.7 2018/05/01 00:04:36 christos Exp $
HOSTLIB= ctf
-.include <bsd.own.mk>
+.include <bsd.init.mk>
SRCS= ctf_create.c \
ctf_decl.c \
diff -r 0e01793730a7 -r e366a9460c93 tools/libdwarf/Makefile
--- a/tools/libdwarf/Makefile Mon Apr 30 22:17:46 2018 +0000
+++ b/tools/libdwarf/Makefile Tue May 01 00:04:34 2018 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2014/03/09 17:10:38 christos Exp $
+# $NetBSD: Makefile,v 1.8 2018/05/01 00:04:36 christos Exp $
HOSTLIB=dwarf
-.include <bsd.own.mk>
+.include <bsd.init.mk>
SRCS= \
dwarf_abbrev.c \
diff -r 0e01793730a7 -r e366a9460c93 tools/libelf/Makefile
--- a/tools/libelf/Makefile Mon Apr 30 22:17:46 2018 +0000
+++ b/tools/libelf/Makefile Tue May 01 00:04:34 2018 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2014/03/09 17:10:12 christos Exp $
+# $NetBSD: Makefile,v 1.9 2018/05/01 00:04:36 christos Exp $
HOSTLIB= elf
-.include <bsd.own.mk>
+.include <bsd.init.mk>
SRCS= elf_begin.c \
elf_cntl.c \
diff -r 0e01793730a7 -r e366a9460c93 tools/libfdt/Makefile
--- a/tools/libfdt/Makefile Mon Apr 30 22:17:46 2018 +0000
+++ b/tools/libfdt/Makefile Tue May 01 00:04:34 2018 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2017/06/08 17:09:29 skrll Exp $
+# $NetBSD: Makefile,v 1.3 2018/05/01 00:04:36 christos Exp $
HOSTLIB= fdt
-.include <bsd.own.mk>
+.include <bsd.init.mk>
LIBFDT_DIR= ${.CURDIR}/../../sys/external/bsd/libfdt/dist
diff -r 0e01793730a7 -r e366a9460c93 tools/lorder/Makefile
--- a/tools/lorder/Makefile Mon Apr 30 22:17:46 2018 +0000
+++ b/tools/lorder/Makefile Tue May 01 00:04:34 2018 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2012/12/02 12:48:33 apb Exp $
+# $NetBSD: Makefile,v 1.13 2018/05/01 00:04:36 christos Exp $
-.include <bsd.own.mk>
+.include <bsd.init.mk>
.-include "${TOOLDIR}/share/compat/defs.mk"
diff -r 0e01793730a7 -r e366a9460c93 tools/makekeys/Makefile
--- a/tools/makekeys/Makefile Mon Apr 30 22:17:46 2018 +0000
+++ b/tools/makekeys/Makefile Tue May 01 00:04:34 2018 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2015/06/24 22:20:26 matt Exp $
+# $NetBSD: Makefile,v 1.2 2018/05/01 00:04:36 christos Exp $
#NOMAN=
-#.include <bsd.own.mk>
+#.include <bsd.init.mk>
HOSTPROG= ${_TOOL_PREFIX}makekeys
HOST_SRCDIR= external/mit/xorg/tools/makekeys
diff -r 0e01793730a7 -r e366a9460c93 tools/mandoc/Makefile
--- a/tools/mandoc/Makefile Mon Apr 30 22:17:46 2018 +0000
+++ b/tools/mandoc/Makefile Tue May 01 00:04:34 2018 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.10 2017/09/07 18:57:47 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2018/05/01 00:04:36 christos 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 0e01793730a7 -r e366a9460c93 tools/mdsetimage/Makefile
--- a/tools/mdsetimage/Makefile Mon Apr 30 22:17:46 2018 +0000
+++ b/tools/mdsetimage/Makefile Tue May 01 00:04:34 2018 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2017/12/27 21:34:12 christos Exp $
+# $NetBSD: Makefile,v 1.15 2018/05/01 00:04:36 christos Exp $
NOMAN= # defined
-.include <bsd.own.mk>
+.include <bsd.init.mk>
HOSTPROGNAME= ${MACHINE_GNU_PLATFORM}-mdsetimage
Home |
Main Index |
Thread Index |
Old Index