svn commit: r364124 - head/cddl/contrib/opensolaris/lib/libdtrace/common

[Alex Richardson]

Author: arichardson
Date: Tue Aug 11 16:46:54 2020
New Revision: 364124
URL: https://svnweb.freebsd.org/changeset/base/364124

Log:
  Fix libdtrace build with zsh as /bin/sh
  
  When zsh runs in POSIX sh mode it does not support the -e flag to echo.
  Use printf instead of echo to avoid the "-e" characters being printed.
  
  Obtained from:	CheriBSD
  Reviewed By:	markj
  Differential Revision: https://reviews.freebsd.org/D26026

Modified:
  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/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrno.sh
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrno.sh	Tue Aug 11 16:46:48 2020	(r364123)
+++ head/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrno.sh	Tue Aug 11 16:46:54 2020	(r364124)
@@ -24,16 +24,15 @@
 # Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 set -e
 
-echo "\
-/*\n\
- * Copyright 2003 Sun Microsystems, Inc.  All rights reserved.\n\
- * Use is subject to license terms.\n\
- */\n\
-\n\
-#pragma ident\t\"%Z%%M%\t%I%\t%E% SMI\"\n"
+printf "%s" "
+/*
+ * Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+"
 
 pattern='^#define[	 ]\(E[A-Z0-9]*\)[	 ]*\([A-Z0-9]*\).*$'
 replace='inline int \1 = \2;@#pragma D binding "1.0" \1'

Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrtags.sh
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrtags.sh	Tue Aug 11 16:46:48 2020	(r364123)
+++ head/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrtags.sh	Tue Aug 11 16:46:54 2020	(r364124)
@@ -24,37 +24,34 @@
 # Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 set -e
 
-BSDECHO=-e
+printf "%s" "
+/*
+ * Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
 
-echo ${BSDECHO} "\
-/*\n\
- * Copyright 2003 Sun Microsystems, Inc.  All rights reserved.\n\
- * Use is subject to license terms.\n\
- */\n\
-\n\
-#pragma ident\t\"%Z%%M%\t%I%\t%E% SMI\"\n\
-\n\
 #include <dt_errtags.h>
-\n\
-static const char *const _dt_errtags[] = {"
 
+static const char *const _dt_errtags[] = {
+"
+
 pattern='^	\(D_[A-Z0-9_]*\),*'
 replace='	"\1",'
 
 sed -n "s/$pattern/$replace/p" || exit 1
 
-echo ${BSDECHO} "\
-};\n\
-\n\
-static const int _dt_ntag = sizeof (_dt_errtags) / sizeof (_dt_errtags[0]);\n\
-\n\
+printf "%s" "
+};
+
+static const int _dt_ntag = sizeof (_dt_errtags) / sizeof (_dt_errtags[0]);
+
 const char *
 dt_errtag(dt_errtag_t tag)
 {
 	return (_dt_errtags[(tag > 0 && tag < _dt_ntag) ? tag : 0]);
-}"
+}
+"
 
 exit 0

Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/mknames.sh
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libdtrace/common/mknames.sh	Tue Aug 11 16:46:48 2020	(r364123)
+++ head/cddl/contrib/opensolaris/lib/libdtrace/common/mknames.sh	Tue Aug 11 16:46:54 2020	(r364124)
@@ -24,33 +24,30 @@
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 set -e
 
-BSDECHO=-e
+printf "%s" "
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
 
-echo ${BSDECHO} "\
-/*\n\
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.\n\
- * Use is subject to license terms.\n\
- */\n\
-\n\
-#pragma ident\t\"%Z%%M%\t%I%\t%E% SMI\"\n\
-\n\
-#include <dtrace.h>\n\
-\n\
+#include <dtrace.h>
+
 /*ARGSUSED*/
-const char *\n\
-dtrace_subrstr(dtrace_hdl_t *dtp, int subr)\n\
-{\n\
-	switch (subr) {"
+const char *
+dtrace_subrstr(dtrace_hdl_t *dtp, int subr)
+{
+	switch (subr) {
+"
 
 nawk '
 /^#define[ 	]*DIF_SUBR_/ && $2 != "DIF_SUBR_MAX" {
 	printf("\tcase %s: return (\"%s\");\n", $2, tolower(substr($2, 10)));
 }'
 
-echo ${BSDECHO} "\
-	default: return (\"unknown\");\n\
-	}\n\
-}"
+printf "%s" "
+	default: return (\"unknown\");
+	}
+}
+"

Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/mksignal.sh
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libdtrace/common/mksignal.sh	Tue Aug 11 16:46:48 2020	(r364123)
+++ head/cddl/contrib/opensolaris/lib/libdtrace/common/mksignal.sh	Tue Aug 11 16:46:54 2020	(r364124)
@@ -24,16 +24,15 @@
 # Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 set -e
 
-echo "\
-/*\n\
- * Copyright 2003 Sun Microsystems, Inc.  All rights reserved.\n\
- * Use is subject to license terms.\n\
- */\n\
-\n\
-#pragma ident\t\"%Z%%M%\t%I%\t%E% SMI\"\n"
+printf "%s" "
+/*
+ * Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+"
 
 pattern='^#define[	 ]*_*\(SIG[A-Z0-9]*\)[	 ]\{1,\}\([A-Z0-9]*\).*$'
 replace='inline int \1 = \2;@#pragma D binding "1.0" \1'