conf/163778: [patch] Conditionalize tools in the source tree

Garrett Cooper yanegomi at gmail.com
Mon Jan 2 12:40:08 UTC 2012


>Number:         163778
>Category:       conf
>Synopsis:       [patch] Conditionalize tools in the source tree
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 02 12:40:07 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Garrett Cooper
>Release:        9.0-PRERELEASE
>Organization:
n/a
>Environment:
FreeBSD bayonetta.local 9.0-PRERELEASE FreeBSD 9.0-PRERELEASE #0 r229187M: Sun Jan  1 14:39:27 PST 2012     gcooper at bayonetta.local:/usr/obj/store/freebsd/stable/9/sys/BAYONETTA  amd64
>Description:
The attached patch takes the work that Warner Losh started on conditionalizing build tools and takes it to the next level by conditionalizing AWK and removing hardcoded references to objdump, nm, etc.

This PR should be assigned to Warner.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: usr.bin/top/Makefile
===================================================================
--- usr.bin/top/Makefile	(revision 229271)
+++ usr.bin/top/Makefile	(working copy)
@@ -28,7 +28,7 @@
 SIGCONV_AWK= ${.CURDIR}/../../contrib/top/sigconv.awk
 SIGNAL_H= ${DESTDIR}/usr/include/sys/signal.h
 sigdesc.h: ${SIGCONV_AWK} ${SIGNAL_H}
-	awk -f ${SIGCONV_AWK} < ${SIGNAL_H} > ${.TARGET}
+	${AWK} -f ${SIGCONV_AWK} < ${SIGNAL_H} > ${.TARGET}
 
 CLEANFILES+= top.local.h top.x
 .SUFFIXES: .X .x .H .h
Index: usr.bin/file/Makefile
===================================================================
--- usr.bin/file/Makefile	(revision 229271)
+++ usr.bin/file/Makefile	(working copy)
@@ -33,7 +33,7 @@
 DPADD=	${LIBMAGIC} ${LIBZ}
 LDADD=	-lmagic -lz
 
-FILEVER!= awk '$$1 == "\#define" && $$2 == "VERSION" { print $$3; exit }' \
+FILEVER!= ${AWK} '$$1 == "\#define" && $$2 == "VERSION" { print $$3; exit }' \
 			${.CURDIR}/../../lib/libmagic/config.h
 
 CLEANFILES+=	${MAN}
Index: usr.bin/getconf/Makefile
===================================================================
--- usr.bin/getconf/Makefile	(revision 229271)
+++ usr.bin/getconf/Makefile	(working copy)
@@ -14,10 +14,10 @@
 all:	conflicts
 
 .gperf.c:
-	LC_ALL=C awk -f ${.CURDIR}/fake-gperf.awk ${.IMPSRC} >${.TARGET}
+	LC_ALL=C ${AWK} -f ${.CURDIR}/fake-gperf.awk ${.IMPSRC} >${.TARGET}
 
 .gperf.names:
-	LC_ALL=C awk '/^[_A-Z]/ { print; }' ${.IMPSRC} | \
+	LC_ALL=C ${AWK} '/^[_A-Z]/ { print; }' ${.IMPSRC} | \
 	    sed -e 's/,$$//' >${.TARGET}
 
 conflicts: conflicting.names unique.names
Index: secure/lib/libcrypto/Makefile.inc
===================================================================
--- secure/lib/libcrypto/Makefile.inc	(revision 229271)
+++ secure/lib/libcrypto/Makefile.inc	(working copy)
@@ -60,7 +60,7 @@
 		fn=`basename $$i .pod`; \
 		if [ "$$fn" != "${_skip}" ]; then \
 		perl ${LCRYPTO_SRC}/util/extract-names.pl < $$i | \
-		  awk "/^$$fn\$$/ { next; } \
+		  ${AWK} "/^$$fn\$$/ { next; } \
 		  { print \"MLINKS+= $$fn.${_sec} \" \$$1 \".${_sec}\" }" >> \
 		  ${.CURDIR}/Makefile.man; \
 		fi; \
Index: gnu/usr.bin/cc/cc_tools/Makefile
===================================================================
--- gnu/usr.bin/cc/cc_tools/Makefile	(revision 229271)
+++ gnu/usr.bin/cc/cc_tools/Makefile	(working copy)
@@ -216,15 +216,15 @@
 CLEANFILES+=	cs-tconfig.h
 # Options
 optionlist: ${OPT_FILES}
-	LC_ALL=C awk -f ${GCCDIR}/opt-gather.awk ${.ALLSRC} > ${.TARGET}
+	LC_ALL=C ${AWK} -f ${GCCDIR}/opt-gather.awk ${.ALLSRC} > ${.TARGET}
 
 options.h:	optionlist
-	LC_ALL=C awk -f ${GCCDIR}/opt-functions.awk \
+	LC_ALL=C ${AWK} -f ${GCCDIR}/opt-functions.awk \
 	    -f ${GCCDIR}/opth-gen.awk \
 		< ${.ALLSRC} > ${.TARGET}
 
 options.c:	optionlist
-	LC_ALL=C awk -f ${GCCDIR}/opt-functions.awk \
+	LC_ALL=C ${AWK} -f ${GCCDIR}/opt-functions.awk \
 	    -f ${GCCDIR}/optc-gen.awk \
 		-v header_name="config.h system.h coretypes.h tm.h" \
 		< ${.ALLSRC} > ${.TARGET}
Index: gnu/usr.bin/dtc/Makefile
===================================================================
--- gnu/usr.bin/dtc/Makefile	(revision 229271)
+++ gnu/usr.bin/dtc/Makefile	(working copy)
@@ -16,9 +16,9 @@
 WARNS?=	2
 CFLAGS+= -I. -I${.CURDIR} -I${DTCDIR} -I${LIBFDTDIR}
 
-VERSIONMAJ!= awk '/^VERSION =/ { print $$3 }' ${DTCDIR}/Makefile
-VERSIONMIN!= awk '/^PATCHLEVEL =/ { print $$3 }' ${DTCDIR}/Makefile
-VERSIONSUB!= awk '/^SUBLEVEL =/ { print $$3 }' ${DTCDIR}/Makefile
+VERSIONMAJ!= ${AWK} '/^VERSION =/ { print $$3 }' ${DTCDIR}/Makefile
+VERSIONMIN!= ${AWK} '/^PATCHLEVEL =/ { print $$3 }' ${DTCDIR}/Makefile
+VERSIONSUB!= ${AWK} '/^SUBLEVEL =/ { print $$3 }' ${DTCDIR}/Makefile
 VERSIONEXTRA=
 
 DTCVERSION:=	${VERSIONMAJ}.${VERSIONMIN}.${VERSIONSUB}${VERSIONEXTRA}
Index: gnu/lib/libgcc/Makefile
===================================================================
--- gnu/lib/libgcc/Makefile	(revision 229271)
+++ gnu/lib/libgcc/Makefile	(working copy)
@@ -330,7 +330,7 @@
 	    | sed -e '/^[   ]*#/d' \
 	          -e 's/^%\(if\|else\|elif\|endif\|define\)/#\1/' \
 	    | ${CC} ${CFLAGS} -E -xassembler-with-cpp -; \
-	) | awk -f ${SHLIB_MKMAP} ${SHLIB_MKMAP_OPTS} > ${.TARGET}
+	) | ${AWK} -f ${SHLIB_MKMAP} ${SHLIB_MKMAP_OPTS} > ${.TARGET}
 
 CLEANFILES +=	libgcc.map
 
Index: gnu/lib/libregex/doc/Makefile
===================================================================
--- gnu/lib/libregex/doc/Makefile	(revision 229271)
+++ gnu/lib/libregex/doc/Makefile	(working copy)
@@ -7,7 +7,7 @@
 CLEANFILES += regex.texi
 
 regex.texi: xregex.texi ../regex.h
-	awk -f ${.CURDIR}/include.awk -v source=${.CURDIR}/../regex.h \
+	${AWK} -f ${.CURDIR}/include.awk -v source=${.CURDIR}/../regex.h \
 	  < ${.CURDIR}/xregex.texi \
           | expand >$@
 
Index: kerberos5/tools/make-roken/Makefile
===================================================================
--- kerberos5/tools/make-roken/Makefile	(revision 229271)
+++ kerberos5/tools/make-roken/Makefile	(working copy)
@@ -8,4 +8,4 @@
 .include <bsd.prog.mk>
 
 make-roken.c: ${KRB5DIR}/lib/roken/roken.awk ${KRB5DIR}/lib/roken/roken.h.in
-	awk -f ${.ALLSRC} > ${.TARGET}
+	${AWK} -f ${.ALLSRC} > ${.TARGET}
Index: share/doc/usd/13.viref/Makefile
===================================================================
--- share/doc/usd/13.viref/Makefile	(revision 229271)
+++ share/doc/usd/13.viref/Makefile	(working copy)
@@ -27,7 +27,7 @@
 	    -e 's/DOUBLEQUOTE/""/' \
 	    -e "s/SQUOTE/'/" \
 	    -e 's/ /__SPACE/g' < index | \
-	sort -u '-t	' -k 1,1 -k 2n | awk -f ${SRCDIR}/merge.awk | \
+	sort -u '-t	' -k 1,1 -k 2n | ${AWK} -f ${SRCDIR}/merge.awk | \
 	sed -e 's/__SPACE/ /g' \
 	    -e "s/^\\(['\\.]\\)/\\\\\&\\1/" > ${.TARGET}
 .endfor
Index: share/mk/sys.mk
===================================================================
--- share/mk/sys.mk	(revision 229271)
+++ share/mk/sys.mk	(working copy)
@@ -31,23 +31,27 @@
 .SUFFIXES:	.out .a .ln .o .c .cc .cpp .cxx .C .m .F .f .e .r .y .l .S .asm .s .cl .p .h .sh
 .endif
 
-AR		?=	ar
+AR		?=	${__X}ar
 .if defined(%POSIX)
 ARFLAGS		?=	-rv
 .else
 ARFLAGS		?=	rl
 .endif
-RANLIB		?=	ranlib
+RANLIB		?=	${__X}ranlib
 
-AS		?=	as
+AS		?=	${__X}as
 AFLAGS		?=
 ACFLAGS		?=
 
+.if !defined(%POSIX)
+AWK		?=	awk
+.endif
+
 .if defined(%POSIX)
-CC		?=	c89
+CC		?=	${__X}c89
 CFLAGS		?=	-O
 .else
-CC		?=	cc
+CC		?=	${__X}cc
 .if ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "mips"
 CFLAGS		?=	-O -pipe
 .else
@@ -73,11 +77,11 @@
 #CFLAGS		+=	-g
 .endif
 
-CXX		?=	c++
+CXX		?=	${__X}c++
 CXXFLAGS	?=	${CFLAGS:N-std=*:N-Wnested-externs:N-W*-prototypes:N-Wno-pointer-sign:N-Wold-style-definition}
 PO_CXXFLAGS	?=	${CXXFLAGS}
 
-CPP		?=	cpp
+CPP		?=	${__X}cpp
 
 .if empty(.MAKEFLAGS:M-s)
 ECHO		?=	echo
@@ -111,7 +115,7 @@
 LEX		?=	lex
 LFLAGS		?=
 
-LD		?=	ld
+LD		?=	${__X}ld
 LDFLAGS		?=
 
 LINT		?=	lint
@@ -123,17 +127,38 @@
 
 MAKE		?=	make
 
+.if !defined(%POSIX)
+NM		?=	${__X}nm
+.endif
+
 OBJC		?=	cc
 OBJCFLAGS	?=	${OBJCINCLUDES} ${CFLAGS} -Wno-import
 
+.if !defined(%POSIX)
+OBJCOPY		?=	${__X}objcopy
+OBJDUMP		?=	${__X}objdump
+.endif
+
 PC		?=	pc
 PFLAGS		?=
 
 RC		?=	f77
 RFLAGS		?=
 
+.if !defined(%POSIX)
+SED		?=	sed
+
+# Macro for doing in-place file editing using regexps
+REINPLACE_ARGS	?=	-i.bak
+REINPLACE_CMD	?=	${SED} ${REINPLACE_ARGS}
+.endif
+
 SHELL		?=	sh
 
+.if !defined(%POSIX)
+SIZE		?=	${__X}size
+.endif
+
 YACC		?=	yacc
 .if defined(%POSIX)
 YFLAGS		?=
Index: share/mk/bsd.symver.mk
===================================================================
--- share/mk/bsd.symver.mk	(revision 229271)
+++ share/mk/bsd.symver.mk	(working copy)
@@ -42,6 +42,6 @@
 # them to the symbol version generator.
 ${VERSION_MAP}: ${VERSION_DEF} ${_vgen} ${SYMBOL_MAPS}
 	cat ${SYMBOL_MAPS} | ${CPP} - - \
-	    | awk -v vfile=${VERSION_DEF} -f ${_vgen} > ${.TARGET}
+	    | ${AWK} -v vfile=${VERSION_DEF} -f ${_vgen} > ${.TARGET}
 .endif	# !empty(VERSION_DEF) && !empty(SYMBOL_MAPS)
 .endif  # !target(__<bsd.symver.mk>__)
Index: lib/libmagic/Makefile
===================================================================
--- lib/libmagic/Makefile	(revision 229271)
+++ lib/libmagic/Makefile	(working copy)
@@ -42,7 +42,7 @@
 mkmagic: apprentice.c funcs.c magic.c print.c
 	${CC} ${CFLAGS} -DCOMPILE_ONLY ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
 
-FILEVER!= awk '$$1 == "\#define" && $$2 == "VERSION" { print $$3; exit }' \
+FILEVER!= ${AWK} '$$1 == "\#define" && $$2 == "VERSION" { print $$3; exit }' \
 			${.CURDIR}/config.h
 CLEANFILES+=	${MAN}
 .for mp in ${MAN}
Index: crypto/openssl/crypto/rc4/Makefile
===================================================================
--- crypto/openssl/crypto/rc4/Makefile	(revision 229271)
+++ crypto/openssl/crypto/rc4/Makefile	(working copy)
@@ -54,7 +54,7 @@
 rc4-x86_64.s: asm/rc4-x86_64.pl;	$(PERL) asm/rc4-x86_64.pl $@
 
 rc4-ia64.s: asm/rc4-ia64.S
-	@case `awk '/^#define RC4_INT/{print$$NF}' $(TOP)/include/openssl/opensslconf.h` in \
+	@case `${AWK} '/^#define RC4_INT/{print$$NF}' $(TOP)/include/openssl/opensslconf.h` in \
 	int)	set -x; $(CC) $(CFLAGS) -DSZ=4 -E asm/rc4-ia64.S > $@ ;; \
 	char)	set -x; $(CC) $(CFLAGS) -DSZ=1 -E asm/rc4-ia64.S > $@ ;; \
 	*)	exit 1 ;; \
Index: sbin/route/Makefile
===================================================================
--- sbin/route/Makefile	(revision 229271)
+++ sbin/route/Makefile	(working copy)
@@ -20,7 +20,7 @@
 keywords.h: keywords
 	sed -e '/^#/d' -e '/^$$/d' ${.CURDIR}/keywords > _keywords.tmp
 	LC_ALL=C tr 'a-z' 'A-Z' < _keywords.tmp | paste _keywords.tmp - | \
-	    awk '{ \
+	    ${AWK} '{ \
 		if (NF > 1) \
 			printf "#define\tK_%s\t%d\n\t{\"%s\", K_%s},\n", \
 			    $$2, NR, $$1, $$2 }' \
Index: contrib/groff/font/devlj4/generate/Makefile
===================================================================
--- contrib/groff/font/devlj4/generate/Makefile	(revision 229271)
+++ contrib/groff/font/devlj4/generate/Makefile	(working copy)
@@ -208,7 +208,7 @@
 
 S: $(AUTOFONT)/9nb00086.tfm $(SPECIALMAP) $(srcdir)/special.awk
 	$(HPFTODIT) $(SFLAG) $(AUTOFONT)/9nb00086.tfm $(SPECIALMAP) - \
-	| awk -f $(srcdir)/special.awk > $@
+	| ${AWK} -f $(srcdir)/special.awk > $@
 
 #
 # TrueType
Index: Makefile.inc1
===================================================================
--- Makefile.inc1	(revision 229271)
+++ Makefile.inc1	(working copy)
@@ -117,7 +117,7 @@
 MAKEOBJDIRPREFIX?=	/usr/obj
 .if !defined(OSRELDATE)
 .if exists(/usr/include/osreldate.h)
-OSRELDATE!=	awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \
+OSRELDATE!=	${AWK} '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \
 		/usr/include/osreldate.h
 .else
 OSRELDATE=	0
@@ -1508,7 +1513,7 @@
 
 .if !defined(FDT_DTS_FILE) || empty(FDT_DTS_FILE)
 .if exists(${KERNCONFDIR}/${KERNCONF})
-FDT_DTS_FILE!= awk 'BEGIN {FS="="} /^makeoptions[[:space:]]+FDT_DTS_FILE/ {print $$2}' \
+FDT_DTS_FILE!= ${AWK} 'BEGIN {FS="="} /^makeoptions[[:space:]]+FDT_DTS_FILE/ {print $$2}' \
 	${KERNCONFDIR}/${KERNCONF}
 .endif
 .endif
Index: sys/boot/arm/uboot/Makefile
===================================================================
--- sys/boot/arm/uboot/Makefile	(revision 229271)
+++ sys/boot/arm/uboot/Makefile	(working copy)
@@ -100,7 +100,7 @@
 
 loader.help: help.common help.uboot
 	cat ${.ALLSRC} | \
-	    awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET}
+	    ${AWK} -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET}
 
 .PATH: ${.CURDIR}/../../forth
 FILES=	loader.help
Index: sys/boot/powerpc/ps3/Makefile
===================================================================
--- sys/boot/powerpc/ps3/Makefile	(revision 229271)
+++ sys/boot/powerpc/ps3/Makefile	(working copy)
@@ -110,7 +110,7 @@
 
 loader.help: help.common help.ps3
 	cat ${.ALLSRC} | \
-	    awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET}
+	    ${AWK} -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET}
 
 .PATH: ${.CURDIR}/../../forth
 FILES=	loader.help loader.4th support.4th loader.conf
Index: sys/boot/powerpc/uboot/Makefile
===================================================================
--- sys/boot/powerpc/uboot/Makefile	(revision 229271)
+++ sys/boot/powerpc/uboot/Makefile	(working copy)
@@ -101,7 +101,7 @@
 
 loader.help: help.common help.uboot
 	cat ${.ALLSRC} | \
-	    awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET}
+	    ${AWK} -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET}
 
 .PATH: ${.CURDIR}/../../forth
 FILES=	loader.help
Index: sys/boot/powerpc/ofw/Makefile
===================================================================
--- sys/boot/powerpc/ofw/Makefile	(revision 229271)
+++ sys/boot/powerpc/ofw/Makefile	(working copy)
@@ -99,7 +99,7 @@
 
 loader.help: help.common help.ofw
 	cat ${.ALLSRC} | \
-	    awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET}
+	    ${AWK} -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET}
 
 .PATH: ${.CURDIR}/../../forth
 FILES=	loader.help loader.4th support.4th loader.conf
Index: sys/boot/sparc64/loader/Makefile
===================================================================
--- sys/boot/sparc64/loader/Makefile	(revision 229271)
+++ sys/boot/sparc64/loader/Makefile	(working copy)
@@ -80,7 +80,7 @@
 
 loader.help: help.common help.sparc64
 	cat ${.ALLSRC} | \
-	    awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET}
+	    ${AWK} -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET}
 
 .PATH: ${.CURDIR}/../../forth
 FILES=	loader.help loader.4th support.4th loader.conf
Index: sys/boot/userboot/ficl/Makefile
===================================================================
--- sys/boot/userboot/ficl/Makefile	(revision 229271)
+++ sys/boot/userboot/ficl/Makefile	(working copy)
@@ -59,7 +59,7 @@
 
 softcore.c: ${SOFTWORDS} softcore.awk
 	(cd ${.CURDIR}/../../ficl/softwords; cat ${SOFTWORDS} \
-	    | awk -f softcore.awk -v datestamp="`LC_ALL=C date`") > ${.TARGET}
+	    | ${AWK} -f softcore.awk -v datestamp="`LC_ALL=C date`") > ${.TARGET}
 
 #.if ${MACHINE_CPUARCH} == "amd64"
 #${SRCS:M*.c:R:S/$/.o/g}: machine
Index: sys/boot/ia64/common/Makefile
===================================================================
--- sys/boot/ia64/common/Makefile	(revision 229271)
+++ sys/boot/ia64/common/Makefile	(working copy)
@@ -28,7 +28,7 @@
 FILES+=		loader.help
 CLEANFILES+=	loader.help
 loader.help: help.common
-	cat ${.ALLSRC} | awk -f ${.CURDIR}/../../common/merge_help.awk \
+	cat ${.ALLSRC} | ${AWK} -f ${.CURDIR}/../../common/merge_help.awk \
 	    > ${.TARGET}
 
 .PATH: ${.CURDIR}/../../forth
Index: sys/boot/pc98/boot2/Makefile
===================================================================
--- sys/boot/pc98/boot2/Makefile	(revision 229271)
+++ sys/boot/pc98/boot2/Makefile	(working copy)
@@ -7,8 +7,6 @@
 
 FILES=		boot boot1 boot2
 
-NM?=		nm
-
 BOOT_COMCONSOLE_PORT?= 0x238
 BOOT_COMCONSOLE_SPEED?= 9600
 B2SIOFMT?=	0x3
@@ -100,7 +98,7 @@
 	rm -f boot2.s.tmp
 
 boot2.h: boot1.out
-	${NM} -t d ${.ALLSRC} | awk '/([0-9])+ T (read|putc)/ \
+	${NM} -t d ${.ALLSRC} | ${AWK} '/([0-9])+ T (read|putc)/ \
 	    { x = $$1 - ORG1; \
 	    printf("#define %sORG %#x\n", toupper($$3), REL1 + x) }' \
 	    ORG1=`printf "%d" ${ORG1}` \
Index: sys/boot/pc98/loader/Makefile
===================================================================
--- sys/boot/pc98/loader/Makefile	(revision 229271)
+++ sys/boot/pc98/loader/Makefile	(working copy)
@@ -77,7 +77,7 @@
 	strip -R .comment -R .note ${.TARGET}
 
 loader.help: help.common help.pc98
-	cat ${.ALLSRC} | awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET}
+	cat ${.ALLSRC} | ${AWK} -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET}
 
 .PATH: ${.CURDIR}/../../forth 
 FILES=	loader loader.help loader.4th support.4th loader.conf
Index: sys/boot/i386/boot2/Makefile
===================================================================
--- sys/boot/i386/boot2/Makefile	(revision 229271)
+++ sys/boot/i386/boot2/Makefile	(working copy)
@@ -4,8 +4,6 @@
 
 FILES=		boot boot1 boot2
 
-NM?=		nm
-
 # A value of 0x80 enables LBA support.
 BOOT_BOOT1_FLAGS?=	0x80
 
@@ -101,7 +99,7 @@
 	rm -f boot2.s.tmp
 
 boot2.h: boot1.out
-	${NM} -t d ${.ALLSRC} | awk '/([0-9])+ T xread/ \
+	${NM} -t d ${.ALLSRC} | ${AWK} '/([0-9])+ T xread/ \
 	    { x = $$1 - ORG1; \
 	    printf("#define XREADORG %#x\n", REL1 + x) }' \
 	    ORG1=`printf "%d" ${ORG1}` \
Index: sys/boot/i386/loader/Makefile
===================================================================
--- sys/boot/i386/loader/Makefile	(revision 229271)
+++ sys/boot/i386/loader/Makefile	(working copy)
@@ -94,7 +94,7 @@
 	strip -R .comment -R .note ${.TARGET}
 
 loader.help: help.common help.i386
-	cat ${.ALLSRC} | awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET}
+	cat ${.ALLSRC} | ${AWK} -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET}
 
 FILES=	${LOADER}
 # XXX INSTALLFLAGS_loader= -b
Index: sys/boot/ficl/Makefile
===================================================================
--- sys/boot/ficl/Makefile	(revision 229271)
+++ sys/boot/ficl/Makefile	(working copy)
@@ -51,7 +51,7 @@
 
 softcore.c: ${SOFTWORDS} softcore.awk
 	(cd ${.CURDIR}/softwords; cat ${SOFTWORDS} \
-	    | awk -f softcore.awk -v datestamp="`LC_ALL=C date`") > ${.TARGET}
+	    | ${AWK} -f softcore.awk -v datestamp="`LC_ALL=C date`") > ${.TARGET}
 
 .if ${MACHINE_CPUARCH} == "amd64"
 ${SRCS:M*.c:R:S/$/.o/g}: machine
Index: sys/modules/sound/driver/emu10kx/Makefile
===================================================================
--- sys/modules/sound/driver/emu10kx/Makefile	(revision 229271)
+++ sys/modules/sound/driver/emu10kx/Makefile	(working copy)
@@ -18,17 +18,17 @@
 
 emu10k1-alsa%diked.h: emu10k1-alsa.h
 	grep -v '#include' ${.OODATE} | $(CC) -E -D__KERNEL__ -dM - \
-	    | awk -F"[ 	(]" '/define/ \
+	    | ${AWK} -F"[ 	(]" '/define/ \
 	    { print "#ifndef " $$2 ; print ; print "#endif" }' \
 	    >${.TARGET}
 p16v-alsa%diked.h: p16v-alsa.h
 	grep -v '#include' ${.OODATE} | $(CC) -E -D__KERNEL__ -dM - \
-	    | awk -F"[ 	(]" '/define/ \
+	    | ${AWK} -F"[ 	(]" '/define/ \
 	    { print "#ifndef " $$2 ; print ; print "#endif" }' \
 	    >${.TARGET}
 p17v-alsa%diked.h: p17v-alsa.h
 	grep -v '#include' ${.OODATE} | $(CC) -E -D__KERNEL__ -dM - \
-	    | awk -F"[ 	(]" '/define/ \
+	    | ${AWK} -F"[ 	(]" '/define/ \
 	    { print "#ifndef " $$2 ; print ; print "#endif" }' \
 	    >${.TARGET}
 
Index: sys/modules/sound/driver/emu10k1/Makefile
===================================================================
--- sys/modules/sound/driver/emu10k1/Makefile	(revision 229271)
+++ sys/modules/sound/driver/emu10k1/Makefile	(working copy)
@@ -12,7 +12,7 @@
 
 emu10k1-alsa%diked.h: emu10k1-alsa.h
 	grep -v '#include' ${.OODATE} | $(CC) -E -D__KERNEL__ -dM - \
-	    | awk -F"[ 	(]" '/define/ \
+	    | ${AWK} -F"[ 	(]" '/define/ \
 	    { print "#ifndef " $$2 ; print ; print "#endif" }' \
 	    >${.TARGET}
 
Index: sys/Makefile
===================================================================
--- sys/Makefile	(revision 229271)
+++ sys/Makefile	(working copy)
@@ -25,7 +25,7 @@
 SUBDIR+=modules
 .endif
 
-HTAGSFLAGS+= -at `awk -F= '/^RELEASE *=/{release=$2}; END {print "FreeBSD", release, "kernel"}' < conf/newvers.sh`
+HTAGSFLAGS+= -at `${AWK} -F= '/^RELEASE *=/{release=$2}; END {print "FreeBSD", release, "kernel"}' < conf/newvers.sh`
 
 # You need the devel/cscope port for this.
 cscope: cscope.out
Index: sys/conf/kmod.mk
===================================================================
--- sys/conf/kmod.mk	(revision 229271)
+++ sys/conf/kmod.mk	(working copy)
@@ -63,10 +63,8 @@
 # backwards compat option for older systems.
 MACHINE_CPUARCH?=${MACHINE_ARCH:C/mipse[lb]/mips/:C/armeb/arm/:C/powerpc64/powerpc/}
 
-AWK?=		awk
 KMODLOAD?=	/sbin/kldload
 KMODUNLOAD?=	/sbin/kldunload
-OBJCOPY?=	objcopy
 
 .if defined(KMODDEPS)
 .error "Do not use KMODDEPS on 5.0+; use MODULE_VERSION/MODULE_DEPEND"
@@ -213,7 +211,7 @@
 .else
 	grep -v '^#' < ${EXPORT_SYMS} > export_syms
 .endif
-	awk -f ${SYSDIR}/conf/kmod_syms.awk ${.TARGET} \
+	${AWK} -f ${SYSDIR}/conf/kmod_syms.awk ${.TARGET} \
 	    export_syms | xargs -J% ${OBJCOPY} % ${.TARGET}
 .endif
 .endif
Index: sys/conf/kern.pre.mk
===================================================================
--- sys/conf/kern.pre.mk	(revision 229271)
+++ sys/conf/kern.pre.mk	(working copy)
@@ -17,12 +17,6 @@
 
 M=		${MACHINE_CPUARCH}
 
-AWK?=		awk
-LINT?=		lint
-NM?=		nm
-OBJCOPY?=	objcopy
-SIZE?=		size
-
 .if defined(DEBUG)
 _MINUS_O=	-O
 CTFFLAGS+=	-g
Index: sys/teken/libteken/Makefile
===================================================================
--- sys/teken/libteken/Makefile	(revision 229271)
+++ sys/teken/libteken/Makefile	(working copy)
@@ -31,7 +31,7 @@
 	teken.3 teken_set_winsize.3
 
 teken_state.h: ${SRCDIR}/gensequences ${SRCDIR}/sequences
-	awk -f ${SRCDIR}/gensequences ${SRCDIR}/sequences > ${.TARGET}
+	${AWK} -f ${SRCDIR}/gensequences ${SRCDIR}/sequences > ${.TARGET}
 
 VERSION_DEF=	${.CURDIR}/../../../lib/libc/Versions.def
 SYMBOL_MAPS=	${.CURDIR}/Symbol.map


>Release-Note:
>Audit-Trail:
>Unformatted:


More information about the freebsd-bugs mailing list