Module Name: src
Committed By: lukem
Date: Sun Jun 11 10:43:51 UTC 2023
Modified Files:
src: BUILDING Makefile
src/doc: BUILDING.mdoc
src/etc: Makefile.params
Log Message:
more NBUILDJOBS deprecation
The NBUILDJOBS option was deprecated in 2002;
there's no need to keep warning about it,
remove from params / show-params,
and only document as obsolete.
To generate a diff of this commit:
cvs rdiff -u -r1.152 -r1.153 src/BUILDING
cvs rdiff -u -r1.336 -r1.337 src/Makefile
cvs rdiff -u -r1.141 -r1.142 src/doc/BUILDING.mdoc
cvs rdiff -u -r1.22 -r1.23 src/etc/Makefile.params
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/BUILDING
diff -u src/BUILDING:1.152 src/BUILDING:1.153
--- src/BUILDING:1.152 Mon Jun 5 22:36:17 2023
+++ src/BUILDING Sun Jun 11 10:43:51 2023
@@ -676,11 +676,6 @@ CONFIGURATION
If using build.sh, this may be set by giving the -u
option.
- NBUILDJOBS Now obsolete. Use the make(1) option -j, instead. See
- below.
-
- Default: Unset.
-
NOCLEANDIR If set, avoids the "make cleandir" phase of a full build.
This has the effect of allowing only changed files in a
source tree to be recompiled. This can speed up builds
@@ -1293,7 +1288,7 @@ EXAMPLES
the release build.
OBSOLETE VARIABLES
- NBUILDJOBS Use the make(1) option -j instead.
+ NBUILDJOBS Use the build.sh and make(1) option -j instead.
USE_NEW_TOOLCHAIN
The new toolchain is now the default. To disable, use
@@ -1316,4 +1311,4 @@ CAVEATS
in object directories. Instead, one may have to manually remove the
files. Consult the UPDATING file for notices concerning this.
-NetBSD June 5, 2023 NetBSD
+NetBSD June 10, 2023 NetBSD
Index: src/Makefile
diff -u src/Makefile:1.336 src/Makefile:1.337
--- src/Makefile:1.336 Fri Jun 2 20:48:09 2023
+++ src/Makefile Sun Jun 11 10:43:51 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.336 2023/06/02 20:48:09 lukem Exp $
+# $NetBSD: Makefile,v 1.337 2023/06/11 10:43:51 lukem Exp $
#
# This is the top-level makefile for building NetBSD. For an outline of
@@ -446,9 +446,6 @@ check-tools: .PHONY
.elif defined(EXTERNAL_TOOLCHAIN)
@echo '*** Using external toolchain rooted at ${EXTERNAL_TOOLCHAIN}.'
.endif
-.if defined(NBUILDJOBS)
- @echo '*** WARNING: NBUILDJOBS is obsolete; use -j directly instead!'
-.endif
# Delete or sanitise a leftover METALOG from a previous build.
clean_METALOG: .PHONY .MAKE
Index: src/doc/BUILDING.mdoc
diff -u src/doc/BUILDING.mdoc:1.141 src/doc/BUILDING.mdoc:1.142
--- src/doc/BUILDING.mdoc:1.141 Mon Jun 5 22:36:17 2023
+++ src/doc/BUILDING.mdoc Sun Jun 11 10:43:51 2023
@@ -1,4 +1,4 @@
-.\" $NetBSD: BUILDING.mdoc,v 1.141 2023/06/05 22:36:17 lukem Exp $
+.\" $NetBSD: BUILDING.mdoc,v 1.142 2023/06/11 10:43:51 lukem Exp $
.\"
.\" Copyright (c) 2001-2023 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -33,7 +33,7 @@
.\" Toolchain prefix for commands
.ds toolprefix nb
.
-.Dd June 5, 2023
+.Dd June 10, 2023
.Dt BUILDING 8
.Os NetBSD
.\" turn off hyphenation
@@ -1169,16 +1169,6 @@ this may be set by giving the
.Fl u
option.
.
-.It Sy NBUILDJOBS
-Now obsolete.
-Use the
-.Xr make 1
-option
-.Fl j ,
-instead.
-See below.
-.DFLTu
-.
.It Sy NOCLEANDIR
If set, avoids the
.Dq make cleandir
@@ -2432,6 +2422,8 @@ portion of the release build.
.
.It Sy NBUILDJOBS
Use the
+.Nm build.sh
+and
.Xr make 1
option
.Fl j
Index: src/etc/Makefile.params
diff -u src/etc/Makefile.params:1.22 src/etc/Makefile.params:1.23
--- src/etc/Makefile.params:1.22 Sun Feb 14 18:45:44 2021
+++ src/etc/Makefile.params Sun Jun 11 10:43:51 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.params,v 1.22 2021/02/14 18:45:44 pgoyette Exp $
+# $NetBSD: Makefile.params,v 1.23 2023/06/11 10:43:51 lukem Exp $
#
# Makefile fragment for printing build parameters.
#
@@ -50,7 +50,7 @@ RELEASEVARS= DISTRIBVER EXTERNAL_TOOLCHA
RELEASEVARS+= BSDOBJDIR BSDSRCDIR BUILDID BUILDINFO BUILDSEED \
DESTDIR KERNARCHDIR KERNCONFDIR KERNOBJDIR KERNSRCDIR MAKE \
KERNEL_DIR MAKECONF MAKEFLAGS MAKEOBJDIR MAKEOBJDIRPREFIX \
- MAKEVERBOSE NBUILDJOBS NETBSDSRCDIR OBJMACHINE OBJMACHINE_ARCH \
+ MAKEVERBOSE NETBSDSRCDIR OBJMACHINE OBJMACHINE_ARCH \
RELEASEDIR RELEASEMACHINEDIR TOOLDIR USR_OBJMACHINE X11SRCDIR
.endif
