Page MenuHomeFreeBSD
Files F164446834

D26025.id75678.diff
No OneTemporary
Actions

D26025.id75678.diff
View Options

Index: Makefile.inc1
===================================================================
--- Makefile.inc1
+++ Makefile.inc1
@@ -2297,6 +2297,10 @@
_basic_bootstrap_tools+=usr.bin/awk usr.bin/cut bin/expr usr.bin/gencat \
usr.bin/join usr.bin/mktemp bin/realpath 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: cddl/contrib/opensolaris/lib/libdtrace/common/mkerrno.sh
===================================================================
--- cddl/contrib/opensolaris/lib/libdtrace/common/mkerrno.sh
+++ 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: cddl/contrib/opensolaris/lib/libdtrace/common/mkerrtags.sh
===================================================================
--- cddl/contrib/opensolaris/lib/libdtrace/common/mkerrtags.sh
+++ 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: cddl/contrib/opensolaris/lib/libdtrace/common/mknames.sh
===================================================================
--- cddl/contrib/opensolaris/lib/libdtrace/common/mknames.sh
+++ 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: cddl/contrib/opensolaris/lib/libdtrace/common/mksignal.sh
===================================================================
--- cddl/contrib/opensolaris/lib/libdtrace/common/mksignal.sh
+++ 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
Sun, Aug 2, 2:30 AM (1 h, 1 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35837596
Default Alt Text
D26025.id75678.diff (2 KB)

Event Timeline