Source-Changes-HG archive

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

[src/trunk]: src more NBUILDJOBS deprecation



details:   https://anonhg.NetBSD.org/src/rev/e7813d8b7f7f
branches:  trunk
changeset: 376338:e7813d8b7f7f
user:      lukem <lukem%NetBSD.org@localhost>
date:      Sun Jun 11 10:43:51 2023 +0000

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

diffstat:

 BUILDING            |   9 ++-------
 Makefile            |   5 +----
 doc/BUILDING.mdoc   |  16 ++++------------
 etc/Makefile.params |   4 ++--
 4 files changed, 9 insertions(+), 25 deletions(-)

diffs (111 lines):

diff -r 3c05ecaa6e5b -r e7813d8b7f7f BUILDING
--- a/BUILDING  Sat Jun 10 21:36:38 2023 +0000
+++ b/BUILDING  Sun Jun 11 10:43:51 2023 +0000
@@ -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
diff -r 3c05ecaa6e5b -r e7813d8b7f7f Makefile
--- a/Makefile  Sat Jun 10 21:36:38 2023 +0000
+++ b/Makefile  Sun Jun 11 10:43:51 2023 +0000
@@ -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
diff -r 3c05ecaa6e5b -r e7813d8b7f7f doc/BUILDING.mdoc
--- a/doc/BUILDING.mdoc Sat Jun 10 21:36:38 2023 +0000
+++ b/doc/BUILDING.mdoc Sun Jun 11 10:43:51 2023 +0000
@@ -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
diff -r 3c05ecaa6e5b -r e7813d8b7f7f etc/Makefile.params
--- a/etc/Makefile.params       Sat Jun 10 21:36:38 2023 +0000
+++ b/etc/Makefile.params       Sun Jun 11 10:43:51 2023 +0000
@@ -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
 



Home | Main Index | Thread Index | Old Index