Module Name: src
Committed By: christos
Date: Tue Mar 29 22:48:04 UTC 2022
Modified Files:
src/share/mk: bsd.inc.mk bsd.kinc.mk bsd.kmodule.mk bsd.lib.mk
bsd.links.mk bsd.obj.mk bsd.own.mk
Log Message:
get rid of old style `` command substitution in shell and use $() instead.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/share/mk/bsd.inc.mk
cvs rdiff -u -r1.37 -r1.38 src/share/mk/bsd.kinc.mk
cvs rdiff -u -r1.76 -r1.77 src/share/mk/bsd.kmodule.mk
cvs rdiff -u -r1.388 -r1.389 src/share/mk/bsd.lib.mk
cvs rdiff -u -r1.34 -r1.35 src/share/mk/bsd.links.mk
cvs rdiff -u -r1.52 -r1.53 src/share/mk/bsd.obj.mk
cvs rdiff -u -r1.1275 -r1.1276 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.inc.mk
diff -u src/share/mk/bsd.inc.mk:1.33 src/share/mk/bsd.inc.mk:1.34
--- src/share/mk/bsd.inc.mk:1.33 Wed Dec 26 17:57:22 2018
+++ src/share/mk/bsd.inc.mk Tue Mar 29 18:48:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.inc.mk,v 1.33 2018/12/26 22:57:22 christos Exp $
+# $NetBSD: bsd.inc.mk,v 1.34 2022/03/29 22:48:04 christos Exp $
.include <bsd.init.mk>
@@ -45,7 +45,7 @@ inclinkinstall: .PHONY
while test $$# -ge 2; do \
l=$$1; shift; \
t=${DESTDIR}$$1; shift; \
- if ttarg=`${TOOL_STAT} -qf '%Y' $$t` && \
+ if ttarg=$$(${TOOL_STAT} -qf '%Y' $$t) && \
[ "$$l" = "$$ttarg" ]; then \
continue ; \
fi ; \
Index: src/share/mk/bsd.kinc.mk
diff -u src/share/mk/bsd.kinc.mk:1.37 src/share/mk/bsd.kinc.mk:1.38
--- src/share/mk/bsd.kinc.mk:1.37 Wed Dec 26 17:57:22 2018
+++ src/share/mk/bsd.kinc.mk Tue Mar 29 18:48:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.kinc.mk,v 1.37 2018/12/26 22:57:22 christos Exp $
+# $NetBSD: bsd.kinc.mk,v 1.38 2022/03/29 22:48:04 christos Exp $
# Variables:
#
@@ -68,7 +68,7 @@ incinstall::
while test $$# -ge 2; do \
l=$$1; shift; \
t=${DESTDIR}$$1; shift; \
- if ttarg=`${TOOL_STAT} -qf '%Y' $$t` && \
+ if ttarg=$$(${TOOL_STAT} -qf '%Y' $$t) && \
[ "$$l" = "$$ttarg" ]; then \
continue ; \
fi ; \
Index: src/share/mk/bsd.kmodule.mk
diff -u src/share/mk/bsd.kmodule.mk:1.76 src/share/mk/bsd.kmodule.mk:1.77
--- src/share/mk/bsd.kmodule.mk:1.76 Mon Mar 29 01:22:49 2021
+++ src/share/mk/bsd.kmodule.mk Tue Mar 29 18:48:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.kmodule.mk,v 1.76 2021/03/29 05:22:49 simonb Exp $
+# $NetBSD: bsd.kmodule.mk,v 1.77 2022/03/29 22:48:04 christos Exp $
# We are not building this with PIE
MKPIE=no
@@ -149,8 +149,8 @@ ${KMOD}_tmp.o: ${OBJS} ${DPADD}
${_MKTARGET_LINK}
${LD} -r -o tmp.o ${OBJS}
${LD} -r \
- `${OBJDUMP} --syms --reloc tmp.o | \
- ${TOOL_AWK} -f ${ARCHDIR}/kmodwrap.awk` \
+ $$(${OBJDUMP} --syms --reloc tmp.o | \
+ ${TOOL_AWK} -f ${ARCHDIR}/kmodwrap.awk) \
-o ${.TARGET} tmp.o
${KMOD}_tramp.S: ${KMOD}_tmp.o ${ARCHDIR}/kmodtramp.awk ${ASM_H}
@@ -166,7 +166,7 @@ ${PROG}: ${KMOD}_tmp.o ${KMOD}_tramp.o
${LD} -r -Map=${.TARGET}.map \
-o tmp.o ${KMOD}_tmp.o ${KMOD}_tramp.o
${OBJCOPY} \
- `${NM} tmp.o | ${TOOL_AWK} -f ${ARCHDIR}/kmodhide.awk` \
+ $$(${NM} tmp.o | ${TOOL_AWK} -f ${ARCHDIR}/kmodhide.awk) \
tmp.o ${.TARGET} && \
rm tmp.o
.else
Index: src/share/mk/bsd.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.388 src/share/mk/bsd.lib.mk:1.389
--- src/share/mk/bsd.lib.mk:1.388 Sun Nov 28 10:47:33 2021
+++ src/share/mk/bsd.lib.mk Tue Mar 29 18:48:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.388 2021/11/28 15:47:33 christos Exp $
+# $NetBSD: bsd.lib.mk,v 1.389 2022/03/29 22:48:04 christos Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include <bsd.init.mk>
@@ -534,7 +534,7 @@ _INSTRANLIB=${empty(PRESERVE):?-a "${RAN
__archivebuild: .USE
${_MKTARGET_BUILD}
@rm -f ${.TARGET}
- ${AR} ${_ARFL} ${.TARGET} `NM=${NM} ${LORDER} ${.ALLSRC:M*o} | ${TSORT}`
+ ${AR} ${_ARFL} ${.TARGET} $$(NM=${NM} ${LORDER} ${.ALLSRC:M*o} | ${TSORT})
.endif
.if !target(__archiveinstall)
@@ -552,7 +552,7 @@ __archivesymlinkpic: .USE
__buildstdlib: .USE
@echo building standard ${.TARGET:T:S/.o//:S/lib//} library
@rm -f ${.TARGET}
- @${LINK.c:S/-nostdinc//} -nostdlib ${LDFLAGS} -Wno-unused-command-line-argument -r -o ${.TARGET} `NM=${NM} ${LORDER} ${.ALLSRC:M*o} | ${TSORT}`
+ @${LINK.c:S/-nostdinc//} -nostdlib ${LDFLAGS} -Wno-unused-command-line-argument -r -o ${.TARGET} $$(NM=${NM} ${LORDER} ${.ALLSRC:M*o} | ${TSORT})
.endif
.if !target(__buildproflib)
@@ -560,7 +560,7 @@ __buildproflib: .USE
@echo building profiled ${.TARGET:T:S/.o//:S/lib//} library
${_MKTARGET_BUILD}
@rm -f ${.TARGET}
- @${LINK.c:S/-nostdinc//} -nostdlib ${LDFLAGS} -r -o ${.TARGET} `NM=${NM} ${LORDER} ${.ALLSRC:M*po} | ${TSORT}`
+ @${LINK.c:S/-nostdinc//} -nostdlib ${LDFLAGS} -r -o ${.TARGET} $$(NM=${NM} ${LORDER} ${.ALLSRC:M*po} | ${TSORT})
.endif
DPSRCS+= ${_YLSRCS}
Index: src/share/mk/bsd.links.mk
diff -u src/share/mk/bsd.links.mk:1.34 src/share/mk/bsd.links.mk:1.35
--- src/share/mk/bsd.links.mk:1.34 Fri Apr 10 12:16:12 2009
+++ src/share/mk/bsd.links.mk Tue Mar 29 18:48:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.links.mk,v 1.34 2009/04/10 16:16:12 apb Exp $
+# $NetBSD: bsd.links.mk,v 1.35 2022/03/29 22:48:04 christos Exp $
.include <bsd.init.mk>
@@ -33,7 +33,7 @@ linksinstall:: realinstall
while test $$# -ge 2; do \
l=$$1; shift; \
t=${DESTDIR}$$1; shift; \
- if ttarg=`${TOOL_STAT} -qf '%Y' $$t` && \
+ if ttarg=$$(${TOOL_STAT} -qf '%Y' $$t) && \
[ "$$l" = "$$ttarg" ]; then \
continue ; \
fi ; \
@@ -67,7 +67,7 @@ configlinksinstall:: configfilesinstall
while test $$# -ge 2; do \
l=$$1; shift; \
t=${DESTDIR}$$1; shift; \
- if ttarg=`${TOOL_STAT} -qf '%Y' $$t` && \
+ if ttarg=$$(${TOOL_STAT} -qf '%Y' $$t) && \
[ "$$l" = "$$ttarg" ]; then \
continue ; \
fi ; \
Index: src/share/mk/bsd.obj.mk
diff -u src/share/mk/bsd.obj.mk:1.52 src/share/mk/bsd.obj.mk:1.53
--- src/share/mk/bsd.obj.mk:1.52 Sat May 19 10:11:30 2018
+++ src/share/mk/bsd.obj.mk Tue Mar 29 18:48:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.obj.mk,v 1.52 2018/05/19 14:11:30 christos Exp $
+# $NetBSD: bsd.obj.mk,v 1.53 2022/03/29 22:48:04 christos Exp $
.if !defined(_BSD_OBJ_MK_)
_BSD_OBJ_MK_=1
@@ -70,7 +70,7 @@ __need_objdir_target=yes
obj:
@cd "${__curdir}"; \
- here=`${PAWD}`/; subdir=$${here#${BSDSRCDIR}/}; \
+ here=$$(${PAWD})/; subdir=$${here#${BSDSRCDIR}/}; \
if [ "$$here" != "$$subdir" ]; then \
if [ ! -d ${__usrobjdir} ]; then \
echo "BSDOBJDIR ${__usrobjdir} does not exist, bailing..."; \
@@ -79,7 +79,7 @@ obj:
subdir=$${subdir%/}; \
dest=${__usrobjdir}/$$subdir${__usrobjdirpf}; \
if [ -x ${TOOL_STAT} ] && \
- ttarg=`${TOOL_STAT} -qf '%Y' $${here}${__objdir}` && \
+ ttarg=$$(${TOOL_STAT} -qf '%Y' $${here}${__objdir}) && \
[ "$$dest" = "$$ttarg" ]; then \
: ; \
else \
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1275 src/share/mk/bsd.own.mk:1.1276
--- src/share/mk/bsd.own.mk:1.1275 Thu Mar 17 02:24:30 2022
+++ src/share/mk/bsd.own.mk Tue Mar 29 18:48:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1275 2022/03/17 06:24:30 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1276 2022/03/29 22:48:04 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -238,7 +238,7 @@ PRINTOBJDIR= echo /error/bsd.own.mk/PRIN
#
.if !defined(_SRC_TOP_) # {
_SRC_TOP_!= cd "${.CURDIR}"; while :; do \
- here=`pwd`; \
+ here=$$(pwd); \
[ -f build.sh ] && [ -d tools ] && { echo $$here; break; }; \
case $$here in /) echo ""; break;; esac; \
cd ..; done
