Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Create a new bsd.hostinit.mk file and put the build definiti...
details: https://anonhg.NetBSD.org/src/rev/0de4cccc85a4
branches: trunk
changeset: 832156:0de4cccc85a4
user: christos <christos%NetBSD.org@localhost>
date: Tue May 01 19:59:42 2018 +0000
description:
Create a new bsd.hostinit.mk file and put the build definitions for all host
programs there; make all Makefiles that use bsd.hostprog.mk include it.
Namely turn off MKREPRO and don't make lint, man pages, info files etc.
Remove the Makefile.inc files that contained these same settings, and
remove the settings from Makefile.host
diffstat:
crypto/external/bsd/heimdal/lib/libasn1/asn1_compile/Makefile | 7 +---
crypto/external/bsd/heimdal/lib/libcom_err/compile_et/Makefile | 6 +---
crypto/external/bsd/heimdal/lib/libsl/slc/Makefile | 6 +---
distrib/amiga/stand/Makefile | 4 ++-
distrib/cdrom/macppc_installboot/Makefile | 6 +---
distrib/cdrom/macppc_mkboothfs/Makefile | 5 +--
external/bsd/nvi/catalog/Makefile | 6 +---
external/bsd/openldap/Makefile | 4 ++-
external/bsd/pcc/libexec/mkext/Makefile | 5 +--
external/gpl2/texinfo/makedoc/Makefile | 6 +---
external/mit/xorg/tools/Makefile.inc | 6 ----
external/mit/xorg/tools/bdftopcf/Makefile | 4 +-
external/mit/xorg/tools/fc-cache/Makefile | 4 +-
external/mit/xorg/tools/makekeys/Makefile | 4 +-
external/mit/xorg/tools/makestrs/Makefile | 4 +-
external/mit/xorg/tools/mkfontscale/Makefile | 4 +-
external/mit/xorg/tools/ucs2any/Makefile | 4 +-
games/boggle/mkdict/Makefile | 4 +-
games/boggle/mkindex/Makefile | 4 +-
share/mk/bsd.hostinit.mk | 13 ++++++++++
sys/arch/amiga/stand/loadkmap/din/Makefile | 4 ++-
sys/arch/amiga/stand/loadkmap/es/Makefile | 4 ++-
sys/arch/amiga/stand/loadkmap/fr/Makefile | 4 ++-
sys/arch/amiga/stand/loadkmap/pl_din/Makefile | 4 ++-
sys/arch/amiga/stand/loadkmap/pl_us/Makefile | 4 ++-
sys/arch/amiga/stand/loadkmap/sw/Makefile | 4 ++-
sys/arch/amiga/stand/loadkmap/us/Makefile | 4 ++-
sys/arch/atari/stand/keymaps/de/Makefile | 4 ++-
sys/arch/atari/stand/keymaps/fr/Makefile | 4 ++-
sys/arch/atari/stand/keymaps/uk/Makefile | 4 ++-
sys/arch/atari/stand/keymaps/us/Makefile | 4 ++-
sys/arch/i386/stand/genprom/Makefile | 4 ++-
sys/arch/i386/stand/misc/Makefile | 4 ++-
sys/arch/macppc/stand/fixcoff/Makefile | 7 ++---
sys/arch/mvme68k/stand/wrtvid/Makefile | 5 ++-
sys/arch/x68k/stand/aout2hux/Makefile | 4 ++-
tools/Makefile.host | 9 +-----
tools/Makefile.inc | 6 ----
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/host-mkdep/Makefile | 5 ++-
tools/libctf/Makefile | 4 +-
tools/libdwarf/Makefile | 4 +-
tools/libelf/Makefile | 4 +-
tools/libfdt/Makefile | 4 +-
tools/llvm-lib/Makefile | 4 +-
tools/llvm/Makefile | 4 +-
tools/lorder/Makefile | 4 +-
tools/mandoc/Makefile | 4 +-
tools/mdsetimage/Makefile | 4 +-
usr.sbin/bta2dpd/cosdata-gen/Makefile | 4 ++-
usr.sbin/bta2dpd/sbc_crc-gen/Makefile | 5 ++-
62 files changed, 152 insertions(+), 135 deletions(-)
diffs (truncated from 806 to 300 lines):
diff -r 8fc3a085eb01 -r 0de4cccc85a4 crypto/external/bsd/heimdal/lib/libasn1/asn1_compile/Makefile
--- a/crypto/external/bsd/heimdal/lib/libasn1/asn1_compile/Makefile Tue May 01 19:53:14 2018 +0000
+++ b/crypto/external/bsd/heimdal/lib/libasn1/asn1_compile/Makefile Tue May 01 19:59:42 2018 +0000
@@ -1,9 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2011/04/15 19:41:11 elric Exp $
+# $NetBSD: Makefile,v 1.3 2018/05/01 19:59:42 christos Exp $
-NOLINT= # defined
-NOMAN= # defined
-
-.include <bsd.own.mk>
+.include <bsd.hostinit.mk>
.include <${.CURDIR}/../../../Makefile.inc>
.PATH: ${HEIMDIST}/lib/asn1 \
diff -r 8fc3a085eb01 -r 0de4cccc85a4 crypto/external/bsd/heimdal/lib/libcom_err/compile_et/Makefile
--- a/crypto/external/bsd/heimdal/lib/libcom_err/compile_et/Makefile Tue May 01 19:53:14 2018 +0000
+++ b/crypto/external/bsd/heimdal/lib/libcom_err/compile_et/Makefile Tue May 01 19:59:42 2018 +0000
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2017/01/30 02:38:50 jakllsch Exp $
+# $NetBSD: Makefile,v 1.5 2018/05/01 19:59:42 christos Exp $
-NOMAN= # defined
-
-.include <bsd.own.mk>
+.include <bsd.hostinit.mk>
.include <${.CURDIR}/../../../Makefile.inc>
.PATH: ${HEIMDIST}/lib/com_err \
diff -r 8fc3a085eb01 -r 0de4cccc85a4 crypto/external/bsd/heimdal/lib/libsl/slc/Makefile
--- a/crypto/external/bsd/heimdal/lib/libsl/slc/Makefile Tue May 01 19:53:14 2018 +0000
+++ b/crypto/external/bsd/heimdal/lib/libsl/slc/Makefile Tue May 01 19:59:42 2018 +0000
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2017/01/30 02:38:50 jakllsch Exp $
+# $NetBSD: Makefile,v 1.5 2018/05/01 19:59:43 christos Exp $
-NOMAN= # defined
-
-.include <bsd.own.mk>
+.include <bsd.hostinit.mk>
.include <${.CURDIR}/../../../Makefile.inc>
.PATH: ${HEIMDIST}/lib/sl ${HEIMDIST}/lib/roken ${HEIMDIST}/lib/vers
diff -r 8fc3a085eb01 -r 0de4cccc85a4 distrib/amiga/stand/Makefile
--- a/distrib/amiga/stand/Makefile Tue May 01 19:53:14 2018 +0000
+++ b/distrib/amiga/stand/Makefile Tue May 01 19:59:42 2018 +0000
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2015/11/11 16:13:55 phx Exp $
+# $NetBSD: Makefile,v 1.5 2018/05/01 19:59:43 christos Exp $
#
+#include <bsd.hostinit.mk>
+
MISC_FILES= runbootblock.README
UUDECODE_FILES= device-streams.tar.gz \
loadbsd rdbinfo runbootblock xstreamtodev
diff -r 8fc3a085eb01 -r 0de4cccc85a4 distrib/cdrom/macppc_installboot/Makefile
--- a/distrib/cdrom/macppc_installboot/Makefile Tue May 01 19:53:14 2018 +0000
+++ b/distrib/cdrom/macppc_installboot/Makefile Tue May 01 19:59:42 2018 +0000
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2016/03/09 15:44:49 christos Exp $
+# $NetBSD: Makefile,v 1.11 2018/05/01 19:59:43 christos Exp $
-NOMAN= # defined
-
-.include <bsd.init.mk>
+.include <bsd.hostinit.mk>
HOSTPROG= macppc_installboot
SRCS= installboot.c cd9660.c cd9660_util.c
diff -r 8fc3a085eb01 -r 0de4cccc85a4 distrib/cdrom/macppc_mkboothfs/Makefile
--- a/distrib/cdrom/macppc_mkboothfs/Makefile Tue May 01 19:53:14 2018 +0000
+++ b/distrib/cdrom/macppc_mkboothfs/Makefile Tue May 01 19:59:42 2018 +0000
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2012/12/02 12:55:27 apb Exp $
+# $NetBSD: Makefile,v 1.6 2018/05/01 19:59:43 christos Exp $
HOSTPROG= macppc_mkboothfs
SRCS= mkboothfs.c
-NOMAN= # defined
CLEANFILES+= boothfs
-.include <bsd.own.mk>
+.include <bsd.hostinit.mk>
.ifndef NOCOMPATLIB
.-include "${TOOLDIR}/share/compat/defs.mk"
diff -r 8fc3a085eb01 -r 0de4cccc85a4 external/bsd/nvi/catalog/Makefile
--- a/external/bsd/nvi/catalog/Makefile Tue May 01 19:53:14 2018 +0000
+++ b/external/bsd/nvi/catalog/Makefile Tue May 01 19:59:42 2018 +0000
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2013/11/22 16:11:08 christos Exp $
+# $NetBSD: Makefile,v 1.3 2018/05/01 19:59:43 christos Exp $
#
# @(#)Makefile 8.29 (Berkeley) 10/19/96
-NOMAN= # defined
-
-.include "../Makefile.inc"
+.include <bsd.hostinit.mk>
.PATH: ${DIST}/catalog
diff -r 8fc3a085eb01 -r 0de4cccc85a4 external/bsd/openldap/Makefile
--- a/external/bsd/openldap/Makefile Tue May 01 19:53:14 2018 +0000
+++ b/external/bsd/openldap/Makefile Tue May 01 19:59:42 2018 +0000
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2008/07/23 00:21:19 lukem Exp $
+# $NetBSD: Makefile,v 1.3 2018/05/01 19:59:43 christos Exp $
.include "openldap.mk"
+.include <bsd.hostinit.mk>
+
SUBDIR= include
SUBDIR+= lib .WAIT
diff -r 8fc3a085eb01 -r 0de4cccc85a4 external/bsd/pcc/libexec/mkext/Makefile
--- a/external/bsd/pcc/libexec/mkext/Makefile Tue May 01 19:53:14 2018 +0000
+++ b/external/bsd/pcc/libexec/mkext/Makefile Tue May 01 19:59:42 2018 +0000
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.2 2011/04/29 08:33:02 plunky Exp $
+# $NetBSD: Makefile,v 1.3 2018/05/01 19:59:43 christos Exp $
#
# this is really part of ccom, but HOSTPROG and PROG don't mix
#
-.include <bsd.init.mk>
+.include <bsd.hostinit.mk>
.PATH: ${PCC_DIST}/mip \
${PCC_DIST}/arch/${TARGMACH}
HOSTPROG= mkext
-MAN=
SRCS= mkext.c table.c common.c
HOST_CPPFLAGS+= -DMKEXT
diff -r 8fc3a085eb01 -r 0de4cccc85a4 external/gpl2/texinfo/makedoc/Makefile
--- a/external/gpl2/texinfo/makedoc/Makefile Tue May 01 19:53:14 2018 +0000
+++ b/external/gpl2/texinfo/makedoc/Makefile Tue May 01 19:59:42 2018 +0000
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2016/01/14 00:34:53 christos Exp $
+# $NetBSD: Makefile,v 1.2 2018/05/01 19:59:43 christos Exp $
-NOMAN=
-MAKEDOC=
-.include <bsd.init.mk>
+.include <bsd.hostinit.mk>
HOSTPROG= makedoc
SRCS= makedoc.c xexit.c xmalloc.c xstrdup.c
diff -r 8fc3a085eb01 -r 0de4cccc85a4 external/mit/xorg/tools/Makefile.inc
--- a/external/mit/xorg/tools/Makefile.inc Tue May 01 19:53:14 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.1 2018/05/01 17:42:00 christos Exp $
-
-NOINFO= # defined
-NOLINT= # defined
-NOMAN= # defined
-MKREPRO=no # Native toolchain might be unable to do it
diff -r 8fc3a085eb01 -r 0de4cccc85a4 external/mit/xorg/tools/bdftopcf/Makefile
--- a/external/mit/xorg/tools/bdftopcf/Makefile Tue May 01 19:53:14 2018 +0000
+++ b/external/mit/xorg/tools/bdftopcf/Makefile Tue May 01 19:59:42 2018 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2018/05/01 17:42:00 christos Exp $
+# $NetBSD: Makefile,v 1.9 2018/05/01 19:59:43 christos Exp $
-.include <bsd.init.mk>
+.include <bsd.hostinit.mk>
HOSTPROG= bdftopcf
.PATH: ${X11SRCDIR.bdftopcf}
diff -r 8fc3a085eb01 -r 0de4cccc85a4 external/mit/xorg/tools/fc-cache/Makefile
--- a/external/mit/xorg/tools/fc-cache/Makefile Tue May 01 19:53:14 2018 +0000
+++ b/external/mit/xorg/tools/fc-cache/Makefile Tue May 01 19:59:42 2018 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2018/05/01 17:42:01 christos Exp $
+# $NetBSD: Makefile,v 1.13 2018/05/01 19:59:43 christos Exp $
-.include <bsd.init.mk>
+.include <bsd.hostinit.mk>
HOSTPROG= fc-cache
diff -r 8fc3a085eb01 -r 0de4cccc85a4 external/mit/xorg/tools/makekeys/Makefile
--- a/external/mit/xorg/tools/makekeys/Makefile Tue May 01 19:53:14 2018 +0000
+++ b/external/mit/xorg/tools/makekeys/Makefile Tue May 01 19:59:42 2018 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2018/05/01 17:42:01 christos Exp $
+# $NetBSD: Makefile,v 1.7 2018/05/01 19:59:44 christos Exp $
-.include <bsd.init.mk>
+.include <bsd.hostinit.mk>
.PATH: ${X11SRCDIR.X11}/src/util
diff -r 8fc3a085eb01 -r 0de4cccc85a4 external/mit/xorg/tools/makestrs/Makefile
--- a/external/mit/xorg/tools/makestrs/Makefile Tue May 01 19:53:14 2018 +0000
+++ b/external/mit/xorg/tools/makestrs/Makefile Tue May 01 19:59:42 2018 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2018/05/01 17:42:01 christos Exp $
+# $NetBSD: Makefile,v 1.6 2018/05/01 19:59:44 christos Exp $
-.include <bsd.init.mk>
+.include <bsd.hostinit.mk>
.PATH: ${X11SRCDIR.Xt}/util
diff -r 8fc3a085eb01 -r 0de4cccc85a4 external/mit/xorg/tools/mkfontscale/Makefile
--- a/external/mit/xorg/tools/mkfontscale/Makefile Tue May 01 19:53:14 2018 +0000
+++ b/external/mit/xorg/tools/mkfontscale/Makefile Tue May 01 19:59:42 2018 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2018/05/01 17:42:01 christos Exp $
+# $NetBSD: Makefile,v 1.10 2018/05/01 19:59:44 christos Exp $
-.include <bsd.init.mk>
+.include <bsd.hostinit.mk>
HOSTPROG= mkfontscale
diff -r 8fc3a085eb01 -r 0de4cccc85a4 external/mit/xorg/tools/ucs2any/Makefile
--- a/external/mit/xorg/tools/ucs2any/Makefile Tue May 01 19:53:14 2018 +0000
+++ b/external/mit/xorg/tools/ucs2any/Makefile Tue May 01 19:59:42 2018 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2018/05/01 17:42:01 christos Exp $
+# $NetBSD: Makefile,v 1.4 2018/05/01 19:59:44 christos Exp $
-.include <bsd.init.mk>
+.include <bsd.hostinit.mk>
HOSTPROG= ucs2any
.PATH: ${X11SRCDIR.font-util}
diff -r 8fc3a085eb01 -r 0de4cccc85a4 games/boggle/mkdict/Makefile
--- a/games/boggle/mkdict/Makefile Tue May 01 19:53:14 2018 +0000
+++ b/games/boggle/mkdict/Makefile Tue May 01 19:59:42 2018 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2002/09/18 06:16:40 lukem Exp $
+# $NetBSD: Makefile,v 1.13 2018/05/01 19:59:44 christos Exp $
# @(#)Makefile 8.1 (Berkeley) 6/11/93
-NOMAN= # defined
+.include <bsd.hostinit.mk>
HOSTPROG= mkdict
HOST_CPPFLAGS+= -I${.CURDIR}/../boggle
diff -r 8fc3a085eb01 -r 0de4cccc85a4 games/boggle/mkindex/Makefile
--- a/games/boggle/mkindex/Makefile Tue May 01 19:53:14 2018 +0000
+++ b/games/boggle/mkindex/Makefile Tue May 01 19:59:42 2018 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2002/09/18 06:16:40 lukem Exp $
+# $NetBSD: Makefile,v 1.11 2018/05/01 19:59:44 christos Exp $
# @(#)Makefile 8.1 (Berkeley) 6/11/93
-NOMAN= # defined
+.include <bsd.hostinit.mk>
HOSTPROG= mkindex
HOST_CPPFLAGS+= -I${.CURDIR}/../boggle
diff -r 8fc3a085eb01 -r 0de4cccc85a4 share/mk/bsd.hostinit.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/mk/bsd.hostinit.mk Tue May 01 19:59:42 2018 +0000
@@ -0,0 +1,13 @@
+# $NetBSD: bsd.hostinit.mk,v 1.1 2018/05/01 19:59:44 christos Exp $
+
+.if !defined(_BSD_HOSTINIT_MK_)
+_BSD_HOSTINIT_MK_=1
+
+NOINFO= # defined
+NOLINT= # defined
+NOMAN= # defined
+MKREPRO=no # Native toolchain might be unable to do it
+
+.include <bsd.init.mk>
+
+.endif # !defined(_BSD_HOSTINIT_MK_)
diff -r 8fc3a085eb01 -r 0de4cccc85a4 sys/arch/amiga/stand/loadkmap/din/Makefile
--- a/sys/arch/amiga/stand/loadkmap/din/Makefile Tue May 01 19:53:14 2018 +0000
+++ b/sys/arch/amiga/stand/loadkmap/din/Makefile Tue May 01 19:59:42 2018 +0000
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2001/12/12 01:49:35 tv Exp $
+# $NetBSD: Makefile,v 1.8 2018/05/01 19:59:44 christos Exp $
+
+.include <bsd.hostinit.mk>
HOSTPROG= din-kbdmap
NOMAN= # defined
diff -r 8fc3a085eb01 -r 0de4cccc85a4 sys/arch/amiga/stand/loadkmap/es/Makefile
--- a/sys/arch/amiga/stand/loadkmap/es/Makefile Tue May 01 19:53:14 2018 +0000
+++ b/sys/arch/amiga/stand/loadkmap/es/Makefile Tue May 01 19:59:42 2018 +0000
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2001/12/12 01:49:35 tv Exp $
+# $NetBSD: Makefile,v 1.5 2018/05/01 19:59:44 christos Exp $
+
+.include <bsd.hostinit.mk>
HOSTPROG= es-kbdmap
Home |
Main Index |
Thread Index |
Old Index