Page MenuHomeFreeBSD
Files F108129057

D26025.id75686.diff
No OneTemporary
Actions

D26025.id75686.diff
View Options

Index: head/Makefile.inc1
===================================================================
--- head/Makefile.inc1
+++ head/Makefile.inc1
@@ -2240,9 +2240,13 @@
_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
Index: head/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrno.sh
===================================================================
--- head/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrno.sh
+++ head/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrno.sh
@@ -25,6 +25,7 @@
# Use is subject to license terms.
#
#ident "%Z%%M% %I% %E% SMI"
+set -e
echo "\
/*\n\
Index: head/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrtags.sh
===================================================================
--- head/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrtags.sh
+++ head/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrtags.sh
@@ -25,6 +25,7 @@
# Use is subject to license terms.
#
#ident "%Z%%M% %I% %E% SMI"
+set -e
BSDECHO=-e
Index: head/cddl/contrib/opensolaris/lib/libdtrace/common/mknames.sh
===================================================================
--- head/cddl/contrib/opensolaris/lib/libdtrace/common/mknames.sh
+++ head/cddl/contrib/opensolaris/lib/libdtrace/common/mknames.sh
@@ -25,6 +25,7 @@
# Use is subject to license terms.
#
#ident "%Z%%M% %I% %E% SMI"
+set -e
BSDECHO=-e
Index: head/cddl/contrib/opensolaris/lib/libdtrace/common/mksignal.sh
===================================================================
--- head/cddl/contrib/opensolaris/lib/libdtrace/common/mksignal.sh
+++ head/cddl/contrib/opensolaris/lib/libdtrace/common/mksignal.sh
@@ -25,6 +25,7 @@
# Use is subject to license terms.
#
#ident "%Z%%M% %I% %E% SMI"
+set -e
echo "\
/*\n\

File Metadata

Mime Type
text/plain
Expires
Wed, Jan 22, 5:02 PM (5 h, 48 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16032252
Default Alt Text
D26025.id75686.diff (2 KB)

Event Timeline