From owner-svn-src-head@freebsd.org Tue Aug 11 16:46:52 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C83FF3B2780; Tue, 11 Aug 2020 16:46:52 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BQzJD2wgsz3VJM; Tue, 11 Aug 2020 16:46:52 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 208FC1E0B2; Tue, 11 Aug 2020 16:46:50 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07BGknrf013759; Tue, 11 Aug 2020 16:46:49 GMT (envelope-from arichardson@FreeBSD.org) Received: (from arichardson@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07BGknKD013755; Tue, 11 Aug 2020 16:46:49 GMT (envelope-from arichardson@FreeBSD.org) Message-Id: <202008111646.07BGknKD013755@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: arichardson set sender to arichardson@FreeBSD.org using -f From: Alex Richardson Date: Tue, 11 Aug 2020 16:46:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r364123 - in head: . cddl/contrib/opensolaris/lib/libdtrace/common X-SVN-Group: head X-SVN-Commit-Author: arichardson X-SVN-Commit-Paths: in head: . cddl/contrib/opensolaris/lib/libdtrace/common X-SVN-Commit-Revision: 364123 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Aug 2020 16:46:53 -0000 Author: arichardson Date: Tue Aug 11 16:46:48 2020 New Revision: 364123 URL: https://svnweb.freebsd.org/changeset/base/364123 Log: Fix -DBUILD_WITH_STRICT_TMPPATH dtrace builds Some of the scripts used for libdtrace invoke nawk instead of awk (for example cddl/contrib/opensolaris/lib/libdtrace/common/mknames.sh). When bootstrapping all tools, we get the nawk -> awk link while building usr.bin/awk, but when linking/copying the dependencies from the host we were only adding awk but not nawk. This was silently generating invalid files when building libdtrace with BUILD_WITH_STRICT_TMPPATH=1 since those scripts invoke nawk instead of awk. In addition to adding the missing link this commit also adds set -e to those scripts to catch errors like this in the future. Reviewed By: markj, emaste Differential Revision: https://reviews.freebsd.org/D26025 Modified: head/Makefile.inc1 head/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrno.sh head/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrtags.sh head/cddl/contrib/opensolaris/lib/libdtrace/common/mknames.sh head/cddl/contrib/opensolaris/lib/libdtrace/common/mksignal.sh Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Tue Aug 11 16:46:43 2020 (r364122) +++ head/Makefile.inc1 Tue Aug 11 16:46:48 2020 (r364123) @@ -2240,9 +2240,13 @@ ${_bt}-usr.bin/mandoc: ${_bt}-lib/libopenbsd _basic_bootstrap_tools_multilink=usr.bin/grep grep,egrep,fgrep _basic_bootstrap_tools_multilink+=bin/test test,[ # bootstrap tools needed by buildworld: -_basic_bootstrap_tools=usr.bin/awk usr.bin/cut bin/expr usr.bin/gencat \ +_basic_bootstrap_tools=usr.bin/cut bin/expr usr.bin/gencat \ usr.bin/join usr.bin/mktemp bin/rmdir usr.bin/sed usr.bin/sort \ usr.bin/truncate usr.bin/tsort +# Some build scripts use nawk instead of awk (this happens at least in +# cddl/contrib/opensolaris/lib/libdtrace/common/mknames.sh) so we need both awk +# and nawk in ${WORLDTMP}/legacy/bin. +_basic_bootstrap_tools_multilink+=usr.bin/awk awk,nawk # file2c is required for building usr.sbin/config: _basic_bootstrap_tools+=usr.bin/file2c # uuencode/uudecode required for share/tabset Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrno.sh ============================================================================== --- head/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrno.sh Tue Aug 11 16:46:43 2020 (r364122) +++ head/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrno.sh Tue Aug 11 16:46:48 2020 (r364123) @@ -25,6 +25,7 @@ # Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" +set -e echo "\ /*\n\ Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrtags.sh ============================================================================== --- head/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrtags.sh Tue Aug 11 16:46:43 2020 (r364122) +++ head/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrtags.sh Tue Aug 11 16:46:48 2020 (r364123) @@ -25,6 +25,7 @@ # Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" +set -e BSDECHO=-e Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/mknames.sh ============================================================================== --- head/cddl/contrib/opensolaris/lib/libdtrace/common/mknames.sh Tue Aug 11 16:46:43 2020 (r364122) +++ head/cddl/contrib/opensolaris/lib/libdtrace/common/mknames.sh Tue Aug 11 16:46:48 2020 (r364123) @@ -25,6 +25,7 @@ # Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" +set -e BSDECHO=-e Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/mksignal.sh ============================================================================== --- head/cddl/contrib/opensolaris/lib/libdtrace/common/mksignal.sh Tue Aug 11 16:46:43 2020 (r364122) +++ head/cddl/contrib/opensolaris/lib/libdtrace/common/mksignal.sh Tue Aug 11 16:46:48 2020 (r364123) @@ -25,6 +25,7 @@ # Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" +set -e echo "\ /*\n\