svn commit: r251958 - head/contrib/bmake
Author: sjg
Date: Tue Jun 18 19:35:51 2013
New Revision: 251958
URL: http://svnweb.freebsd.org/changeset/base/251958
Log:
Fix use after free bug.
Parse_SetInput:
curFile->fname was using the buffer passed to it - which ReadMakefile frees.
This change makes the comment in ParseEOF about leaking curFile->fname true.
Modified:
head/contrib/bmake/parse.c
Modified: head/contrib/bmake/parse.c
==
--- head/contrib/bmake/parse.c Tue Jun 18 19:03:27 2013(r251957)
+++ head/contrib/bmake/parse.c Tue Jun 18 19:35:51 2013(r251958)
@@ -157,7 +157,7 @@ __RCSID("$NetBSD: parse.c,v 1.188 2013/0
* Structure for a file being read ("included file")
*/
typedef struct IFile {
-const char *fname; /* name of file */
+char *fname; /* name of file */
int lineno; /* current line number in file */
int first_lineno; /* line number of start of text */
int cond_depth; /* 'if' nesting when file opened */
@@ -2344,7 +2344,7 @@ Parse_SetInput(const char *name, int lin
* name of the include file so error messages refer to the right
* place.
*/
-curFile->fname = name;
+curFile->fname = bmake_strdup(name);
curFile->lineno = line;
curFile->first_lineno = line;
curFile->nextbuf = nextbuf;
@@ -2357,6 +2357,8 @@ Parse_SetInput(const char *name, int lin
buf = curFile->nextbuf(curFile->nextbuf_arg, &len);
if (buf == NULL) {
/* Was all a waste of time ... */
+ if (curFile->fname)
+ free(curFile->fname);
free(curFile);
return;
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r251958 - head/contrib/bmake
Yes. On Tue, 18 Jun 2013 14:25:15 -0700, Garrett Cooper writes: >Was this the source of the huge > ignoring stale .depend >messages? ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r252048 - in stable/9: . share/mk
Author: sjg
Date: Thu Jun 20 22:50:08 2013
New Revision: 252048
URL: http://svnweb.freebsd.org/changeset/base/252048
Log:
share/mk: merge: r241298,243393,249057,251506 from head for bmake support.
Makefile: buildworld etc will be done with make from src tree,
make sure that bmake's -J 15,16 are not passed to it.
Reviewed by: obrien
Modified:
stable/9/Makefile
stable/9/share/mk/bsd.crunchgen.mk
stable/9/share/mk/bsd.dep.mk
stable/9/share/mk/bsd.obj.mk
stable/9/share/mk/bsd.own.mk
stable/9/share/mk/bsd.subdir.mk
stable/9/share/mk/bsd.sys.mk (contents, props changed)
stable/9/share/mk/sys.mk
Directory Properties:
stable/9/share/mk/ (props changed)
Modified: stable/9/Makefile
==
--- stable/9/Makefile Thu Jun 20 22:01:36 2013(r252047)
+++ stable/9/Makefile Thu Jun 20 22:50:08 2013(r252048)
@@ -127,7 +127,13 @@ MAKEPATH= ${MAKEOBJDIRPREFIX}${.CURDIR}/
BINMAKE= \
`if [ -x ${MAKEPATH}/make ]; then echo ${MAKEPATH}/make; else echo
${MAKE}; fi` \
-m ${.CURDIR}/share/mk
+
+.if defined(.PARSEDIR)
+# don't pass -J to fmake
+_MAKE= PATH=${PATH} MAKEFLAGS="${MAKEFLAGS:N-J:N1*,1*}" ${BINMAKE} -f
Makefile.inc1 TARGET=${_TARGET} TARGET_ARCH=${_TARGET_ARCH}
+.else
_MAKE= PATH=${PATH} ${BINMAKE} -f Makefile.inc1 TARGET=${_TARGET}
TARGET_ARCH=${_TARGET_ARCH}
+.endif
# Guess machine architecture from machine type, and vice versa.
.if !defined(TARGET_ARCH) && defined(TARGET)
Modified: stable/9/share/mk/bsd.crunchgen.mk
==
--- stable/9/share/mk/bsd.crunchgen.mk Thu Jun 20 22:01:36 2013
(r252047)
+++ stable/9/share/mk/bsd.crunchgen.mk Thu Jun 20 22:50:08 2013
(r252048)
@@ -36,6 +36,8 @@ OUTPUTS=$(OUTMK) $(OUTC) $(PROG).cache
CRUNCHOBJS= ${.OBJDIR}
.if defined(MAKEOBJDIRPREFIX)
CANONICALOBJDIR:= ${MAKEOBJDIRPREFIX}${.CURDIR}
+.elif defined(MAKEOBJDIR) && ${MAKEOBJDIR:M/*} != ""
+CANONICALOBJDIR:=${MAKEOBJDIR}
.else
CANONICALOBJDIR:= /usr/obj${.CURDIR}
.endif
Modified: stable/9/share/mk/bsd.dep.mk
==
--- stable/9/share/mk/bsd.dep.mkThu Jun 20 22:01:36 2013
(r252047)
+++ stable/9/share/mk/bsd.dep.mkThu Jun 20 22:50:08 2013
(r252048)
@@ -123,6 +123,9 @@ ${_YC:R}.o: ${_YC}
.if defined(SRCS)
depend: beforedepend ${DEPENDFILE} afterdepend
+# Tell bmake not to look for generated files via .PATH
+.NOPATH: ${DEPENDFILE}
+
# Different types of sources are compiled with slightly different flags.
# Split up the sources, and filter out headers and non-applicable flags.
MKDEP_CFLAGS= ${CFLAGS:M-nostdinc*} ${CFLAGS:M-[BIDU]*} ${CFLAGS:M-std=*} \
Modified: stable/9/share/mk/bsd.obj.mk
==
--- stable/9/share/mk/bsd.obj.mkThu Jun 20 22:01:36 2013
(r252047)
+++ stable/9/share/mk/bsd.obj.mkThu Jun 20 22:50:08 2013
(r252048)
@@ -44,6 +44,8 @@ :
.if defined(MAKEOBJDIRPREFIX)
CANONICALOBJDIR:=${MAKEOBJDIRPREFIX}${.CURDIR}
+.elif defined(MAKEOBJDIR) && ${MAKEOBJDIR:M/*} != ""
+CANONICALOBJDIR:=${MAKEOBJDIR}
.else
CANONICALOBJDIR:=/usr/obj${.CURDIR}
.endif
@@ -116,6 +118,11 @@ cleanobj: clean cleandepend
.endif
@if [ -L ${.CURDIR}/obj ]; then rm -f ${.CURDIR}/obj; fi
+# Tell bmake not to look for generated files via .PATH
+.if !empty(CLEANFILES)
+.NOPATH: ${CLEANFILES}
+.endif
+
.if !target(clean)
clean:
.if defined(CLEANFILES) && !empty(CLEANFILES)
Modified: stable/9/share/mk/bsd.own.mk
==
--- stable/9/share/mk/bsd.own.mkThu Jun 20 22:01:36 2013
(r252047)
+++ stable/9/share/mk/bsd.own.mkThu Jun 20 22:50:08 2013
(r252048)
@@ -652,7 +652,7 @@ MK_${vv:H}:=${MK_${vv:T}}
.if ${MK_CTF} != "no"
CTFCONVERT_CMD=${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.elif ${MAKE_VERSION} >= 9201210220
+.elif defined(.PARSEDIR) || ${MAKE_VERSION} >= 9201210220
CTFCONVERT_CMD=
.else
CTFCONVERT_CMD=@:
Modified: stable/9/share/mk/bsd.subdir.mk
==
--- stable/9/share/mk/bsd.subdir.mk Thu Jun 20 22:01:36 2013
(r252047)
+++ stable/9/share/mk/bsd.subdir.mk Thu Jun 20 22:50:08 2013
(r252048)
@@ -42,7 +42,7 @@ distribute:
_SUBDIR: .USE
.if defined(SUBDIR) && !empty(SUBDIR) && !defined(NO_SUBDIR)
- @${_+_}for entry in ${SUBDIR}; do \
+ @${_+_}set -e; for entry in ${SUBDIR}; do \
if test -d ${.CURDIR}/$${entry}.${MACHINE_ARCH}; then \
${ECHODIR} "===> ${DIRPRFX}$${entry}.${MACHINE_ARCH}
(${.TARGET:realinstall=install})"; \
edir=$${entry}.${MACHINE_ARCH}; \
@@ -79,7 +79,7 @@ ${
svn commit: r252073 - in stable/8: . share/mk
Author: sjg
Date: Fri Jun 21 22:45:03 2013
New Revision: 252073
URL: http://svnweb.freebsd.org/changeset/base/252073
Log:
share/mk: merge: r241298,243393,249057,251506 from head for bmake support.
merge: r252048 from stable/9
Makefile: merge: r252048 from stable/9 for bmake support.
Reviewed by: obrien
Modified:
stable/8/Makefile
stable/8/share/mk/bsd.dep.mk
stable/8/share/mk/bsd.obj.mk
stable/8/share/mk/bsd.own.mk
stable/8/share/mk/bsd.subdir.mk
stable/8/share/mk/bsd.sys.mk
stable/8/share/mk/sys.mk
Directory Properties:
stable/8/ (props changed)
stable/8/share/ (props changed)
stable/8/share/mk/ (props changed)
Modified: stable/8/Makefile
==
--- stable/8/Makefile Fri Jun 21 22:26:18 2013(r252072)
+++ stable/8/Makefile Fri Jun 21 22:45:03 2013(r252073)
@@ -117,7 +117,13 @@ MAKEPATH= ${MAKEOBJDIRPREFIX}${.CURDIR}/
BINMAKE= \
`if [ -x ${MAKEPATH}/make ]; then echo ${MAKEPATH}/make; else echo
${MAKE}; fi` \
-m ${.CURDIR}/share/mk
+
+.if defined(.PARSEDIR)
+# don't pass -J to fmake
+_MAKE= PATH=${PATH} MAKEFLAGS="${MAKEFLAGS:N-J:N1*,1*}" ${BINMAKE} -f
Makefile.inc1
+.else
_MAKE= PATH=${PATH} ${BINMAKE} -f Makefile.inc1
+.endif
#
# Make sure we have an up-to-date make(1). Only world and buildworld
@@ -175,7 +181,7 @@ ${TGTS}:
.MAIN: all
STARTTIME!= LC_ALL=C date
-CHECK_TIME!= find ${.CURDIR}/sys/sys/param.h -mtime -0s
+CHECK_TIME!= find ${.CURDIR}/sys/sys/param.h -mtime -0s; echo
.if !empty(CHECK_TIME)
.error check your date/time: ${STARTTIME}
.endif
Modified: stable/8/share/mk/bsd.dep.mk
==
--- stable/8/share/mk/bsd.dep.mkFri Jun 21 22:26:18 2013
(r252072)
+++ stable/8/share/mk/bsd.dep.mkFri Jun 21 22:45:03 2013
(r252073)
@@ -123,6 +123,9 @@ ${_YC:R}.o: ${_YC}
.if defined(SRCS)
depend: beforedepend ${DEPENDFILE} afterdepend
+# Tell bmake not to look for generated files via .PATH
+.NOPATH: ${DEPENDFILE}
+
# Different types of sources are compiled with slightly different flags.
# Split up the sources, and filter out headers and non-applicable flags.
.if ${CC} == "icc"
Modified: stable/8/share/mk/bsd.obj.mk
==
--- stable/8/share/mk/bsd.obj.mkFri Jun 21 22:26:18 2013
(r252072)
+++ stable/8/share/mk/bsd.obj.mkFri Jun 21 22:45:03 2013
(r252073)
@@ -44,6 +44,8 @@ :
.if defined(MAKEOBJDIRPREFIX)
CANONICALOBJDIR:=${MAKEOBJDIRPREFIX}${.CURDIR}
+.elif defined(MAKEOBJDIR) && ${MAKEOBJDIR:M/*} != ""
+CANONICALOBJDIR:=${MAKEOBJDIR}
.else
CANONICALOBJDIR:=/usr/obj${.CURDIR}
.endif
@@ -116,6 +118,11 @@ cleanobj: clean cleandepend
.endif
@if [ -L ${.CURDIR}/obj ]; then rm -f ${.CURDIR}/obj; fi
+# Tell bmake not to look for generated files via .PATH
+.if !empty(CLEANFILES)
+.NOPATH: ${CLEANFILES}
+.endif
+
.if !target(clean)
clean:
.if defined(CLEANFILES) && !empty(CLEANFILES)
Modified: stable/8/share/mk/bsd.own.mk
==
--- stable/8/share/mk/bsd.own.mkFri Jun 21 22:26:18 2013
(r252072)
+++ stable/8/share/mk/bsd.own.mkFri Jun 21 22:45:03 2013
(r252073)
@@ -573,6 +573,8 @@ MK_${vv:H}:=${MK_${vv:T}}
.if ${MK_CTF} != "no"
CTFCONVERT_CMD=${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.elif defined(.PARSEDIR) || ${MAKE_VERSION} >= 9201210220
+CTFCONVERT_CMD=
.else
CTFCONVERT_CMD=@:
.endif
Modified: stable/8/share/mk/bsd.subdir.mk
==
--- stable/8/share/mk/bsd.subdir.mk Fri Jun 21 22:26:18 2013
(r252072)
+++ stable/8/share/mk/bsd.subdir.mk Fri Jun 21 22:45:03 2013
(r252073)
@@ -42,7 +42,7 @@ distribute:
_SUBDIR: .USE
.if defined(SUBDIR) && !empty(SUBDIR) && !defined(NO_SUBDIR)
- @${_+_}for entry in ${SUBDIR}; do \
+ @${_+_}set -e; for entry in ${SUBDIR}; do \
if test -d ${.CURDIR}/$${entry}.${MACHINE_ARCH}; then \
${ECHODIR} "===> ${DIRPRFX}$${entry}.${MACHINE_ARCH}
(${.TARGET:realinstall=install})"; \
edir=$${entry}.${MACHINE_ARCH}; \
@@ -80,7 +80,7 @@ ${__stage}${__target}: _SUBDIR
.endif
.endfor
${__target}:
- ${_+_}cd ${.CURDIR}; ${MAKE} build${__target}; ${MAKE}
install${__target}
+ ${_+_}set -e; cd ${.CURDIR}; ${MAKE} build${__target}; ${MAKE}
install${__target}
.endfor
.if !target(install)
Modified: stable/8/share/mk/bsd.sys.mk
==
--- stable/8/share/mk/bsd.sys.mkFri Jun 21 22:26:18 2013
(r252072)
+++ stable/8/share/mk/bsd.sys.mkFri Jun 21 22:45:03 2013
(r252073)
@@ -87,3 +87
svn commit: r252419 - head
Author: sjg
Date: Sun Jun 30 15:00:07 2013
New Revision: 252419
URL: http://svnweb.freebsd.org/changeset/base/252419
Log:
Use && rather than ; when success of previous job matters.
Modified:
head/Makefile.inc1
head/UPDATING
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Sun Jun 30 13:41:21 2013(r252418)
+++ head/Makefile.inc1 Sun Jun 30 15:00:07 2013(r252419)
@@ -1131,11 +1131,11 @@ legacy:
.endif
.for _tool in tools/build
${_+_}@${ECHODIR} "===> ${_tool} (obj,includes,depend,all,install)"; \
- cd ${.CURDIR}/${_tool}; \
- ${MAKE} DIRPRFX=${_tool}/ obj; \
- ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy
includes; \
- ${MAKE} DIRPRFX=${_tool}/ depend; \
- ${MAKE} DIRPRFX=${_tool}/ all; \
+ cd ${.CURDIR}/${_tool} && \
+ ${MAKE} DIRPRFX=${_tool}/ obj && \
+ ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy
includes && \
+ ${MAKE} DIRPRFX=${_tool}/ depend && \
+ ${MAKE} DIRPRFX=${_tool}/ all && \
${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy install
.endfor
@@ -1264,10 +1264,10 @@ bootstrap-tools:
${_crunch} \
${_nmtree}
${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
- cd ${.CURDIR}/${_tool}; \
- ${MAKE} DIRPRFX=${_tool}/ obj; \
- ${MAKE} DIRPRFX=${_tool}/ depend; \
- ${MAKE} DIRPRFX=${_tool}/ all; \
+ cd ${.CURDIR}/${_tool} && \
+ ${MAKE} DIRPRFX=${_tool}/ obj && \
+ ${MAKE} DIRPRFX=${_tool}/ depend && \
+ ${MAKE} DIRPRFX=${_tool}/ all && \
${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy
install
.endfor
@@ -1305,16 +1305,16 @@ build-tools:
usr.bin/mkesdb_static \
usr.bin/mkcsmapper_static
${_+_}@${ECHODIR} "===> ${_tool} (obj,build-tools)"; \
- cd ${.CURDIR}/${_tool}; \
- ${MAKE} DIRPRFX=${_tool}/ obj; \
+ cd ${.CURDIR}/${_tool} && \
+ ${MAKE} DIRPRFX=${_tool}/ obj && \
${MAKE} DIRPRFX=${_tool}/ build-tools
.endfor
.for _tool in \
${_gcc_tools}
${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all)"; \
- cd ${.CURDIR}/${_tool}; \
- ${MAKE} DIRPRFX=${_tool}/ obj; \
- ${MAKE} DIRPRFX=${_tool}/ depend; \
+ cd ${.CURDIR}/${_tool} && \
+ ${MAKE} DIRPRFX=${_tool}/ obj && \
+ ${MAKE} DIRPRFX=${_tool}/ depend && \
${MAKE} DIRPRFX=${_tool}/ all
.endfor
@@ -1363,10 +1363,10 @@ cross-tools:
${_crunchide} \
${_kgzip}
${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
- cd ${.CURDIR}/${_tool}; \
- ${MAKE} DIRPRFX=${_tool}/ obj; \
- ${MAKE} DIRPRFX=${_tool}/ depend; \
- ${MAKE} DIRPRFX=${_tool}/ all; \
+ cd ${.CURDIR}/${_tool} && \
+ ${MAKE} DIRPRFX=${_tool}/ obj && \
+ ${MAKE} DIRPRFX=${_tool}/ depend && \
+ ${MAKE} DIRPRFX=${_tool}/ all && \
${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX} install
.endfor
@@ -1545,10 +1545,10 @@ lib/libradius__L: lib/libmd__L
${_lib}__PL: .PHONY
.if exists(${.CURDIR}/${_lib})
${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
- cd ${.CURDIR}/${_lib}; \
- ${MAKE} DIRPRFX=${_lib}/ obj; \
- ${MAKE} DIRPRFX=${_lib}/ depend; \
- ${MAKE} -DNO_PROFILE -DNO_PIC DIRPRFX=${_lib}/ all; \
+ cd ${.CURDIR}/${_lib} && \
+ ${MAKE} DIRPRFX=${_lib}/ obj && \
+ ${MAKE} DIRPRFX=${_lib}/ depend && \
+ ${MAKE} -DNO_PROFILE -DNO_PIC DIRPRFX=${_lib}/ all && \
${MAKE} -DNO_PROFILE -DNO_PIC DIRPRFX=${_lib}/ install
.endif
.endfor
@@ -1557,10 +1557,10 @@ ${_lib}__PL: .PHONY
${_lib}__L: .PHONY
.if exists(${.CURDIR}/${_lib})
${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
- cd ${.CURDIR}/${_lib}; \
- ${MAKE} DIRPRFX=${_lib}/ obj; \
- ${MAKE} DIRPRFX=${_lib}/ depend; \
- ${MAKE} DIRPRFX=${_lib}/ all; \
+ cd ${.CURDIR}/${_lib} && \
+ ${MAKE} DIRPRFX=${_lib}/ obj && \
+ ${MAKE} DIRPRFX=${_lib}/ depend && \
+ ${MAKE} DIRPRFX=${_lib}/ all && \
${MAKE} DIRPRFX=${_lib}/ install
.endif
.endfor
@@ -1570,10 +1570,10 @@ ${_lib}__L: .PHONY
# modules.
lib/libpam__L: .PHONY
${_+_}@${ECHODIR} "===> lib/libpam (obj,depend,all,install)"; \
- cd ${.CURDIR}/lib/libpam; \
- ${MAKE} DIRPRFX=lib/libpam/ obj; \
- ${MAKE} DIRPRFX=lib/libpam/ depend; \
- ${MAKE} DIRPRFX=l
Re: svn commit: r251422 - in head: contrib/bmake usr.bin/bmake
On Fri, 5 Jul 2013 18:06:37 +0200, Tijl Coosemans writes: >> I've been noticing that bmake doesn't run parallel jobs as like fmake. No it doesn't. fmake exports the name of a FIFO, which any submake can open. bmake passes open descriptors to a pipe, but only if the target is flagged .MAKE. .MAKE's other property is to run the target even when -n is given. This feature, while documented in fmake's man page doesn't work. >> I've attached a Makefile that I think shows what's going wrong. Hmm I can't see the makefile, but if you add .MAKE to the target which run's the sub-makes you will see things work as expected. >> Bmake outputs the target name in -j mode (e.g. "--- all ---"), but >> there's no "--- sub_1 ---" and "--- sub_3 ---" which suggests -j isn't Because the -J flag although passed, the descriptors were closed, this cause the sub-make to ignore -j and -J not to be added to .MAKEFLAGS >> I suspect the descriptors for the job server have to remain open so >> submakes can pick them up. At least, when I comment out the two fcntl Correct, and if the target is flagged .MAKE, the close-on-exec flag will be cleared in the child. >Now that I've taken a closer look at the code it seems bmake requires >targets that run make to be marked with .MAKE. Several targets in >Makefile and Makefile.inc1 already have this, but some don't, such as >bootstrap-tools. Can this be added there? I expect so. I was being somewhat cautious. As noted above .MAKE is also supposed to cause the target to run even when -n is given. I noted that some targets which might otherwise warrant .MAKE also did things which might not be a good idea with -n. FWIW make -N would supresses the behavior of .MAKE, but few are likely to have noted that. I don't see any reason to not add .MAKE to bootstrap-tools. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r252856 - head
Author: sjg
Date: Sat Jul 6 00:13:08 2013
New Revision: 252856
URL: http://svnweb.freebsd.org/changeset/base/252856
Log:
Sprinkle some .MAKE magic
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Sat Jul 6 00:10:52 2013(r252855)
+++ head/Makefile.inc1 Sat Jul 6 00:13:08 2013(r252856)
@@ -1237,7 +1237,7 @@ _kerberos5_bootstrap_tools= \
# Please document (add comment) why something is in 'bootstrap-tools'.
# Try to bound the building of the bootstrap-tool to just the
# FreeBSD versions that need the tool built at this stage of the build.
-bootstrap-tools:
+bootstrap-tools: .MAKE
.for _tool in \
${_clang_tblgen} \
${_kerberos5_bootstrap_tools} \
@@ -1290,7 +1290,7 @@ _gcc_tools= gnu/usr.bin/cc/cc_tools
_rescue= rescue/rescue
.endif
-build-tools:
+build-tools: .MAKE
.for _tool in \
bin/csh \
bin/sh \
@@ -1352,7 +1352,7 @@ _cc= gnu/usr.bin/cc
.endif
.endif
-cross-tools:
+cross-tools: .MAKE
.for _tool in \
${_clang_libs} \
${_clang} \
@@ -1383,12 +1383,12 @@ hierarchy hier:
# interdependencies (__L) are built automatically by the
# ${.CURDIR}/tools/make_libdeps.sh script.
#
-libraries:
- cd ${.CURDIR}; \
- ${MAKE} -f Makefile.inc1 _prereq_libs; \
- ${MAKE} -f Makefile.inc1 _startup_libs; \
- ${MAKE} -f Makefile.inc1 _prebuild_libs; \
- ${MAKE} -f Makefile.inc1 _generic_libs;
+libraries: .MAKE
+ cd ${.CURDIR} && \
+ ${MAKE} -f Makefile.inc1 _prereq_libs && \
+ ${MAKE} -f Makefile.inc1 _startup_libs && \
+ ${MAKE} -f Makefile.inc1 _prebuild_libs && \
+ ${MAKE} -f Makefile.inc1 _generic_libs
#
# static libgcc.a prerequisite for shared libc
@@ -1542,7 +1542,7 @@ lib/libradius__L: lib/libmd__L
.endif
.for _lib in ${_prereq_libs}
-${_lib}__PL: .PHONY
+${_lib}__PL: .PHONY .MAKE
.if exists(${.CURDIR}/${_lib})
${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
cd ${.CURDIR}/${_lib} && \
@@ -1554,7 +1554,7 @@ ${_lib}__PL: .PHONY
.endfor
.for _lib in ${_startup_libs} ${_prebuild_libs:Nlib/libpam} ${_generic_libs}
-${_lib}__L: .PHONY
+${_lib}__L: .PHONY .MAKE
.if exists(${.CURDIR}/${_lib})
${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
cd ${.CURDIR}/${_lib} && \
@@ -1568,7 +1568,7 @@ ${_lib}__L: .PHONY
# libpam is special: we need to build static PAM modules before
# static PAM library, and dynamic PAM library before dynamic PAM
# modules.
-lib/libpam__L: .PHONY
+lib/libpam__L: .PHONY .MAKE
${_+_}@${ECHODIR} "===> lib/libpam (obj,depend,all,install)"; \
cd ${.CURDIR}/lib/libpam && \
${MAKE} DIRPRFX=lib/libpam/ obj && \
@@ -1583,7 +1583,7 @@ _generic_libs: ${_generic_libs:S/$/__L/}
.for __target in all clean cleandepend cleandir depend includes obj
.for entry in ${SUBDIR}
-${entry}.${__target}__D: .PHONY
+${entry}.${__target}__D: .PHONY .MAKE
${_+_}@set -e; if test -d ${.CURDIR}/${entry}.${MACHINE_ARCH}; then \
${ECHODIR} "===> ${DIRPRFX}${entry}.${MACHINE_ARCH}
(${__target})"; \
edir=${entry}.${MACHINE_ARCH}; \
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r253002 - head
>We've run as high as -j48 ... number of logical cpu's "times-two" (it was o= >n a box with 24 logical CPUs). We've (ok dhw@ has) done a lot of empirical measurement to determine optimal jobs_factor numbers for various machines. Right now we are using .75 for boxes with > 16 cores. For smaller boxes we use up to 1.5 Scaling on NUMA boxes is a sore point ;-) If someone could get FreeBSD to scale on larger (64 core) NUMA boxes that would be excellent. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r253616 - head
Author: sjg
Date: Wed Jul 24 17:55:08 2013
New Revision: 253616
URL: http://svnweb.freebsd.org/changeset/base/253616
Log:
Fix bug in universe where if upgrade_checks wants a new make,
it gets built 16 times in parallel in the same location.
While we are at it, until we finish getting rid of fmake,
be explicit about the make we want to use, thus avoid the problem
of the temp make being the wrong version.
Reviewed by: obrien
Modified:
head/Makefile
Modified: head/Makefile
==
--- head/Makefile Wed Jul 24 16:22:27 2013(r253615)
+++ head/Makefile Wed Jul 24 17:55:08 2013(r253616)
@@ -130,11 +130,34 @@ _MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH
.error MAKEOBJDIRPREFIX can only be set in environment, not as a global\
(in make.conf(5)) or command-line variable.
.endif
-MAKEPATH= ${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE}
-BINMAKE= \
- `if [ -x ${MAKEPATH}/make ]; then echo ${MAKEPATH}/make; else echo
${MAKE}; fi` \
+
+# We often need to use the tree's version of make to build it.
+# Choices add to complexity though.
+# We cannot blindly use a make which may not be the one we want
+# so be exlicit - until all choice is removed.
+.if !defined(WITHOUT_BMAKE)
+WANT_MAKE= bmake
+.else
+WANT_MAKE= fmake
+.endif
+MYMAKE=
${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE}/${WANT_MAKE}
+.if defined(.PARSEDIR)
+HAVE_MAKE= bmake
+.else
+HAVE_MAKE= fmake
+.endif
+.if exists(${MYMAKE})
+SUB_MAKE:= ${MYMAKE} -m ${.CURDIR}/share/mk
+.elif ${WANT_MAKE} != ${HAVE_MAKE} || ${WANT_MAKE} != "bmake"
+# It may not exist yet but we may cause it to.
+# In the case of fmake, upgrade_checks may cause a newer version to be built.
+SUB_MAKE= `test -x ${MYMAKE} && echo ${MYMAKE} || echo ${MAKE}` \
-m ${.CURDIR}/share/mk
-_MAKE= PATH=${PATH} ${BINMAKE} -f Makefile.inc1 TARGET=${_TARGET}
TARGET_ARCH=${_TARGET_ARCH}
+.else
+SUB_MAKE= ${MAKE} -m ${.CURDIR}/share/mk
+.endif
+
+_MAKE= PATH=${PATH} ${SUB_MAKE} -f Makefile.inc1 TARGET=${_TARGET}
TARGET_ARCH=${_TARGET_ARCH}
# Guess machine architecture from machine type, and vice versa.
.if !defined(TARGET_ARCH) && defined(TARGET)
@@ -291,11 +314,13 @@ kernel: buildkernel installkernel
# Perform a few tests to determine if the installed tools are adequate
# for building the world.
#
+# Note: if we ever need to care about the version of bmake, simply testing
+# MAKE_VERSION against a required version should suffice.
+#
upgrade_checks:
-.if !defined(.PARSEDIR)
-.if !defined(WITHOUT_BMAKE)
- (cd ${.CURDIR} && ${MAKE} bmake)
-.else
+.if ${HAVE_MAKE} != ${WANT_MAKE}
+ @(cd ${.CURDIR} && ${MAKE} ${WANT_MAKE:S,^f,,})
+.elif ${WANT_MAKE} == "fmake"
@if ! (cd ${.CURDIR}/tools/build/make_check && \
PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \
PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \
@@ -303,14 +328,13 @@ upgrade_checks:
(cd ${.CURDIR} && ${MAKE} make); \
fi
.endif
-.endif
#
# Upgrade make(1) to the current version using the installed
# headers, libraries and tools. Also, allow the location of
# the system bsdmake-like utility to be overridden.
#
-MMAKEENV= MAKEOBJDIRPREFIX=${MAKEPATH} \
+MMAKEENV= MAKEOBJDIRPREFIX=${MYMAKE:H} \
DESTDIR= \
INSTALL="sh ${.CURDIR}/tools/install.sh"
MMAKE= ${MMAKEENV} ${MAKE} \
@@ -327,7 +351,7 @@ make bmake: .PHONY
${MMAKE} obj && \
${MMAKE} depend && \
${MMAKE} all && \
- ${MMAKE} install DESTDIR=${MAKEPATH} BINDIR=
+ ${MMAKE} install DESTDIR=${MYMAKE:H} BINDIR=
PROGNAME=${MYMAKE:T}
tinderbox:
@cd ${.CURDIR} && ${MAKE} DOING_TINDERBOX=YES universe
@@ -377,7 +401,8 @@ MAKEFAIL=tee -a ${FAILFILE}
MAKEFAIL=cat
.endif
-universe: universe_prologue upgrade_checks
+universe_prologue: upgrade_checks
+universe: universe_prologue
universe_prologue:
@echo "--"
@echo ">>> make universe started on ${STARTTIME}"
@@ -387,9 +412,9 @@ universe_prologue:
.endif
.for target in ${TARGETS}
universe: universe_${target}
-.ORDER: universe_prologue upgrade_checks universe_${target} universe_epilogue
+universe_epilogue: universe_${target}
universe_${target}: universe_${target}_prologue
-universe_${target}_prologue:
+universe_${target}_prologue: universe_prologue
@echo ">> ${target} started on `LC_ALL=C date`"
.if !defined(MAKE_JUST_KERNELS)
.for target_arch in ${TARGET_ARCHES_${target}}
@@ -397,7 +422,7 @@ universe_${target}: universe_${target}_$
universe_${target}_${target_arch}: universe_${target}_prologue
@echo ">> ${target}.${target_arch} ${UNIVERSE_TARGET} started on
`LC_ALL=C date`"
@(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \
- ${MAKE} ${JFLAG} ${UNIVERSE_TARGET} \
+
svn commit: r248989 - in vendor/NetBSD/bmake/dist: . mk unit-tests
Author: sjg
Date: Mon Apr 1 21:12:55 2013
New Revision: 248989
URL: http://svnweb.freebsd.org/changeset/base/248989
Log:
Import bmake-20130330
Added:
vendor/NetBSD/bmake/dist/unit-tests/export-env
Modified:
vendor/NetBSD/bmake/dist/ChangeLog
vendor/NetBSD/bmake/dist/FILES
vendor/NetBSD/bmake/dist/Makefile
vendor/NetBSD/bmake/dist/bmake.1
vendor/NetBSD/bmake/dist/bmake.cat1
vendor/NetBSD/bmake/dist/boot-strap
vendor/NetBSD/bmake/dist/configure
vendor/NetBSD/bmake/dist/configure.in
vendor/NetBSD/bmake/dist/dir.c
vendor/NetBSD/bmake/dist/job.c
vendor/NetBSD/bmake/dist/job.h
vendor/NetBSD/bmake/dist/main.c
vendor/NetBSD/bmake/dist/make.1
vendor/NetBSD/bmake/dist/make.h
vendor/NetBSD/bmake/dist/meta.c
vendor/NetBSD/bmake/dist/meta.h
vendor/NetBSD/bmake/dist/mk/ChangeLog
vendor/NetBSD/bmake/dist/mk/dirdeps.mk
vendor/NetBSD/bmake/dist/mk/gendirdeps.mk
vendor/NetBSD/bmake/dist/mk/install-mk
vendor/NetBSD/bmake/dist/mk/meta.stage.mk
vendor/NetBSD/bmake/dist/mk/meta2deps.py
vendor/NetBSD/bmake/dist/mk/meta2deps.sh
vendor/NetBSD/bmake/dist/mk/sys.dependfile.mk
vendor/NetBSD/bmake/dist/parse.c
vendor/NetBSD/bmake/dist/unit-tests/Makefile.in
vendor/NetBSD/bmake/dist/unit-tests/test.exp
vendor/NetBSD/bmake/dist/var.c
Modified: vendor/NetBSD/bmake/dist/ChangeLog
==
--- vendor/NetBSD/bmake/dist/ChangeLog Mon Apr 1 20:57:13 2013
(r248988)
+++ vendor/NetBSD/bmake/dist/ChangeLog Mon Apr 1 21:12:55 2013
(r248989)
@@ -1,3 +1,47 @@
+2013-03-30 Simon J. Gerraty
+
+ * Makefile (MAKE_VERSION): 20130330
+ Merge with NetBSD make, pick up
+ o meta.c: refine the handling of .OODATE in commands.
+ Rather than suppress command comparison for the entire script
+ as though .NOMETA_CMP had been used, only suppress it for the
+ one command line.
+ This allows something like ${.OODATE:M.NOMETA_CMP} to be used to
+ suppress comparison of a command without otherwise affecting it.
+ o make.1: document that
+
+2013-03-22 Simon J. Gerraty
+
+ * Makefile (MAKE_VERSION): 20130321
+ yes, not quite right but its a cooler number.
+ Merge with NetBSD make, pick up
+ o parse.c: fix ParseGmakeExport to be portable
+ and add a unit-test.
+ * meta.c: call meta_init() before makefiles are read and if built
+ with filemon support set .MAKE.PATH_FILEMON to _PATH_FILEMON
+ this let's makefiles test for support.
+ Call meta_mode_init() to process .MAKE.MODE.
+
+2013-03-13 Simon J. Gerraty
+
+ * Makefile (MAKE_VERSION): 20130305
+ Merge with NetBSD make, pick up
+ o run .STALE: target when a dependency from .depend is missing.
+ o job.c: add Job_RunTarget() for the above and .BEGIN
+
+2013-03-03 Simon J. Gerraty
+
+ * Makefile (MAKE_VERSION): 20130303
+ Merge with NetBSD make, pick up
+ o main.c: set .MAKE.OS to utsname.sysname
+ o job.c: more checks for read and poll errors
+ o var.c: lose VarChangeCase() saves 4% time
+
+2013-03-02 Simon J. Gerraty
+
+ * boot-strap: remove MAKEOBJDIRPREFIX from environment since we
+ want to use MAKEOBJDIR
+
2013-01-27 Simon J. Gerraty
* Merge with NetBSD make, pick up
Modified: vendor/NetBSD/bmake/dist/FILES
==
--- vendor/NetBSD/bmake/dist/FILES Mon Apr 1 20:57:13 2013
(r248988)
+++ vendor/NetBSD/bmake/dist/FILES Mon Apr 1 21:12:55 2013
(r248989)
@@ -102,6 +102,7 @@ unit-tests/dotwait
unit-tests/error
unit-tests/export
unit-tests/export-all
+unit-tests/export-env
unit-tests/forloop
unit-tests/forsubst
unit-tests/hash
Modified: vendor/NetBSD/bmake/dist/Makefile
==
--- vendor/NetBSD/bmake/dist/Makefile Mon Apr 1 20:57:13 2013
(r248988)
+++ vendor/NetBSD/bmake/dist/Makefile Mon Apr 1 21:12:55 2013
(r248989)
@@ -1,7 +1,7 @@
-# $Id: Makefile,v 1.5 2013/01/28 19:31:58 sjg Exp $
+# $Id: Makefile,v 1.10 2013/03/31 05:57:19 sjg Exp $
# Base version on src date
-MAKE_VERSION= 20130123
+MAKE_VERSION= 20130330
PROG= bmake
@@ -187,14 +187,14 @@ MANDIR= ${SHAREDIR}/man
.if !exists(.depend)
${OBJS}: config.h
.endif
-.if ${MK_AUTOCONF_MK} == "yes"
-.include
-.endif
# make sure that MAKE_VERSION gets updated.
main.o: ${SRCS} ${MAKEFILE}
# start-delete2 for bsd.after-import.mk
+.if ${MK_AUTOCONF_MK} == "yes"
+.include
+.endif
SHARE_MK?=${SHAREDIR}/mk
MKSRC=${srcdir}/mk
INSTALL?=${srcdir}/install-sh
Modified: vendor/NetBSD/bmake/dist/bmake.1
==
--- vendor/NetBSD/bmake/dist/bmake.1
svn commit: r248990 - vendor/NetBSD/bmake/20130330
Author: sjg Date: Mon Apr 1 21:13:56 2013 New Revision: 248990 URL: http://svnweb.freebsd.org/changeset/base/248990 Log: Tag bmake-20130330 Added: vendor/NetBSD/bmake/20130330/ - copied from r248989, vendor/NetBSD/bmake/dist/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r249033 - in head: contrib/bmake contrib/bmake/mk contrib/bmake/unit-tests usr.bin/bmake usr.bin/bmake/unit-tests
Author: sjg
Date: Tue Apr 2 21:31:11 2013
New Revision: 249033
URL: http://svnweb.freebsd.org/changeset/base/249033
Log:
Update to bmake-20130330
Added:
head/contrib/bmake/unit-tests/export-env
- copied unchanged from r248991,
vendor/NetBSD/bmake/dist/unit-tests/export-env
Modified:
head/contrib/bmake/ChangeLog
head/contrib/bmake/FILES
head/contrib/bmake/Makefile
head/contrib/bmake/bmake.1
head/contrib/bmake/bmake.cat1
head/contrib/bmake/boot-strap
head/contrib/bmake/configure
head/contrib/bmake/configure.in
head/contrib/bmake/dir.c
head/contrib/bmake/job.c
head/contrib/bmake/job.h
head/contrib/bmake/main.c
head/contrib/bmake/make.1
head/contrib/bmake/make.h
head/contrib/bmake/meta.c
head/contrib/bmake/meta.h
head/contrib/bmake/mk/ChangeLog
head/contrib/bmake/mk/dirdeps.mk
head/contrib/bmake/mk/gendirdeps.mk
head/contrib/bmake/mk/install-mk
head/contrib/bmake/mk/meta.stage.mk
head/contrib/bmake/mk/meta2deps.py
head/contrib/bmake/mk/meta2deps.sh
head/contrib/bmake/mk/sys.dependfile.mk
head/contrib/bmake/parse.c
head/contrib/bmake/unit-tests/Makefile.in
head/contrib/bmake/unit-tests/test.exp
head/contrib/bmake/var.c
head/usr.bin/bmake/Makefile
head/usr.bin/bmake/config.h
head/usr.bin/bmake/unit-tests/Makefile
Directory Properties:
head/contrib/bmake/ (props changed)
Modified: head/contrib/bmake/ChangeLog
==
--- head/contrib/bmake/ChangeLogTue Apr 2 19:39:31 2013
(r249032)
+++ head/contrib/bmake/ChangeLogTue Apr 2 21:31:11 2013
(r249033)
@@ -1,3 +1,47 @@
+2013-03-30 Simon J. Gerraty
+
+ * Makefile (MAKE_VERSION): 20130330
+ Merge with NetBSD make, pick up
+ o meta.c: refine the handling of .OODATE in commands.
+ Rather than suppress command comparison for the entire script
+ as though .NOMETA_CMP had been used, only suppress it for the
+ one command line.
+ This allows something like ${.OODATE:M.NOMETA_CMP} to be used to
+ suppress comparison of a command without otherwise affecting it.
+ o make.1: document that
+
+2013-03-22 Simon J. Gerraty
+
+ * Makefile (MAKE_VERSION): 20130321
+ yes, not quite right but its a cooler number.
+ Merge with NetBSD make, pick up
+ o parse.c: fix ParseGmakeExport to be portable
+ and add a unit-test.
+ * meta.c: call meta_init() before makefiles are read and if built
+ with filemon support set .MAKE.PATH_FILEMON to _PATH_FILEMON
+ this let's makefiles test for support.
+ Call meta_mode_init() to process .MAKE.MODE.
+
+2013-03-13 Simon J. Gerraty
+
+ * Makefile (MAKE_VERSION): 20130305
+ Merge with NetBSD make, pick up
+ o run .STALE: target when a dependency from .depend is missing.
+ o job.c: add Job_RunTarget() for the above and .BEGIN
+
+2013-03-03 Simon J. Gerraty
+
+ * Makefile (MAKE_VERSION): 20130303
+ Merge with NetBSD make, pick up
+ o main.c: set .MAKE.OS to utsname.sysname
+ o job.c: more checks for read and poll errors
+ o var.c: lose VarChangeCase() saves 4% time
+
+2013-03-02 Simon J. Gerraty
+
+ * boot-strap: remove MAKEOBJDIRPREFIX from environment since we
+ want to use MAKEOBJDIR
+
2013-01-27 Simon J. Gerraty
* Merge with NetBSD make, pick up
Modified: head/contrib/bmake/FILES
==
--- head/contrib/bmake/FILESTue Apr 2 19:39:31 2013(r249032)
+++ head/contrib/bmake/FILESTue Apr 2 21:31:11 2013(r249033)
@@ -102,6 +102,7 @@ unit-tests/dotwait
unit-tests/error
unit-tests/export
unit-tests/export-all
+unit-tests/export-env
unit-tests/forloop
unit-tests/forsubst
unit-tests/hash
Modified: head/contrib/bmake/Makefile
==
--- head/contrib/bmake/Makefile Tue Apr 2 19:39:31 2013(r249032)
+++ head/contrib/bmake/Makefile Tue Apr 2 21:31:11 2013(r249033)
@@ -1,7 +1,7 @@
-# $Id: Makefile,v 1.5 2013/01/28 19:31:58 sjg Exp $
+# $Id: Makefile,v 1.10 2013/03/31 05:57:19 sjg Exp $
# Base version on src date
-MAKE_VERSION= 20130123
+MAKE_VERSION= 20130330
PROG= bmake
@@ -187,14 +187,14 @@ MANDIR= ${SHAREDIR}/man
.if !exists(.depend)
${OBJS}: config.h
.endif
-.if ${MK_AUTOCONF_MK} == "yes"
-.include
-.endif
# make sure that MAKE_VERSION gets updated.
main.o: ${SRCS} ${MAKEFILE}
# start-delete2 for bsd.after-import.mk
+.if ${MK_AUTOCONF_MK} == "yes"
+.include
+.endif
SHARE_MK?=${SHAREDIR}/mk
MKSRC=${srcdir}/mk
INSTALL?=${srcdir}/install-sh
Modified: head/contrib/bmake/bmake.1
==
--- head/contrib/bmake/bma
svn commit: r249057 - head/share/mk
Author: sjg Date: Wed Apr 3 16:20:21 2013 New Revision: 249057 URL: http://svnweb.freebsd.org/changeset/base/249057 Log: Tell bmake to use the FreeBSD preferred makefile preference list. PR: 177593 Reviewed by: obrien Modified: head/share/mk/sys.mk Modified: head/share/mk/sys.mk == --- head/share/mk/sys.mkWed Apr 3 16:02:01 2013(r249056) +++ head/share/mk/sys.mkWed Apr 3 16:20:21 2013(r249057) @@ -333,6 +333,9 @@ OBJFORMAT?= elf # Tell bmake to expand -V VAR by default .MAKE.EXPAND_VARIABLES= yes +# Tell bmake the makefile preference +.MAKE.MAKEFILE_PREFERENCE?= BSDmakefile makefile Makefile + .if !defined(.PARSEDIR) # We are not bmake, which is more aggressive about searching .PATH # It is sometime necessary to curb its enthusiasm with .NOPATH ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r249395 - head
Author: sjg
Date: Fri Apr 12 00:34:19 2013
New Revision: 249395
URL: http://svnweb.freebsd.org/changeset/base/249395
Log:
If doing buildworld -DWITH_BMAKE make sure bmake does the build.
Modified:
head/Makefile
Modified: head/Makefile
==
--- head/Makefile Thu Apr 11 23:45:40 2013(r249394)
+++ head/Makefile Fri Apr 12 00:34:19 2013(r249395)
@@ -281,6 +281,9 @@ kernel: buildkernel installkernel
#
upgrade_checks:
.if !defined(.PARSEDIR)
+.if defined(WITH_BMAKE)
+ (cd ${.CURDIR} && ${MAKE} bmake)
+.else
@if ! (cd ${.CURDIR}/tools/build/make_check && \
PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \
PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \
@@ -288,6 +291,7 @@ upgrade_checks:
(cd ${.CURDIR} && ${MAKE} make); \
fi
.endif
+.endif
#
# Upgrade make(1) to the current version using the installed
@@ -302,12 +306,12 @@ MMAKE=${MMAKEENV} ${MAKE} \
-DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \
-DNO_CPU_CFLAGS -DNO_WERROR
-make: .PHONY
+make bmake: .PHONY
@echo
@echo "--"
@echo ">>> Building an up-to-date make(1)"
@echo "--"
- ${_+_}@cd ${.CURDIR}/usr.bin/make; \
+ ${_+_}@cd ${.CURDIR}/usr.bin/${.TARGET}; \
${MMAKE} obj && \
${MMAKE} depend && \
${MMAKE} all && \
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r249770 - head/share/mk
Author: sjg
Date: Mon Apr 22 18:11:29 2013
New Revision: 249770
URL: http://svnweb.freebsd.org/changeset/base/249770
Log:
Pass more variables to bsd.prog.mk and
only append to already defined variables.
Submitted by: Garrett Cooper
Modified:
head/share/mk/bsd.progs.mk
Modified: head/share/mk/bsd.progs.mk
==
--- head/share/mk/bsd.progs.mk Mon Apr 22 17:55:12 2013(r249769)
+++ head/share/mk/bsd.progs.mk Mon Apr 22 18:11:29 2013(r249770)
@@ -36,9 +36,11 @@ PROG ?= $t
.if defined(PROG)
# just one of many
-PROG_VARS += CFLAGS CPPFLAGS CXXFLAGS DPADD DPLIBS LDADD MAN SRCS
+PROG_VARS += BINDIR CFLAGS CPPFLAGS CXXFLAGS DPADD DPLIBS LDADD MAN SRCS
.for v in ${PROG_VARS:O:u}
+.if defined(${v}.${PROG})
$v += ${${v}_${PROG}:U${${v}.${PROG}}}
+.endif
.endfor
# for meta mode, there can be only one!
@@ -64,7 +66,8 @@ UPDATE_DEPENDFILE = NO
.include <${.PARSEFILE:S,progs,prog,}>
.ifndef PROG
-PROGS_TARGETS += clean
+# tell progs.mk we might want to install things
+PROGS_TARGETS+= cleandepend cleandir cleanobj depend install
.for p in ${PROGS}
.if defined(PROGS_CXX) && !empty(PROGS_CXX:M$p)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r262749 - head/usr.sbin/makefs
Author: sjg
Date: Tue Mar 4 20:09:23 2014
New Revision: 262749
URL: http://svnweb.freebsd.org/changeset/base/262749
Log:
Allow comments at end of line.
Reviewed by: marcel
Modified:
head/usr.sbin/makefs/mtree.c
Modified: head/usr.sbin/makefs/mtree.c
==
--- head/usr.sbin/makefs/mtree.cTue Mar 4 20:07:36 2014
(r262748)
+++ head/usr.sbin/makefs/mtree.cTue Mar 4 20:09:23 2014
(r262749)
@@ -348,6 +348,13 @@ read_word(FILE *fp, char *buf, size_t bu
if (error == -1)
mtree_error("unexpected end of file");
return (error);
+ case '#': /* comment -- skip to end of line. */
+ if (!esc) {
+ error = skip_to(fp, "\n");
+ if (!error)
+ continue;
+ }
+ break;
case '\\':
esc++;
if (esc == 1)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r263212 - in stable/9: share/mk usr.bin usr.bin/bmake
Author: sjg
Date: Sat Mar 15 23:51:28 2014
New Revision: 263212
URL: http://svnweb.freebsd.org/changeset/base/263212
Log:
Backport bmake to 9 so ports can rely on it being available.
We only build/install it as bmake.
Requested by: bapt
Reviewed by: marcel
Added:
- copied from r263096, stable/10/contrib/bmake/
- copied from r263096, stable/10/usr.bin/bmake/
Directory Properties:
stable/9/contrib/bmake/ (props changed)
stable/9/usr.bin/bmake/ (props changed)
Modified:
stable/9/share/mk/sys.mk
stable/9/usr.bin/Makefile
stable/9/usr.bin/bmake/Makefile.inc
Directory Properties:
stable/9/share/mk/ (props changed)
Modified: stable/9/share/mk/sys.mk
==
--- stable/9/share/mk/sys.mkSat Mar 15 23:09:34 2014(r263211)
+++ stable/9/share/mk/sys.mkSat Mar 15 23:51:28 2014(r263212)
@@ -326,12 +326,6 @@ SHELL= ${__MAKE_SHELL}
# XXX hint for bsd.port.mk
OBJFORMAT?=elf
-# Tell bmake to expand -V VAR by default
-.MAKE.EXPAND_VARIABLES= yes
-
-# Tell bmake the makefile preference
-.MAKE.MAKEFILE_PREFERENCE= BSDmakefile makefile Makefile
-
.if !defined(.PARSEDIR)
# We are not bmake, which is more aggressive about searching .PATH
# It is sometime necessary to curb its enthusiasm with .NOPATH
@@ -345,5 +339,25 @@ OBJFORMAT?=elf
.endif
+.if defined(.PARSEDIR)
+# Tell bmake to expand -V VAR by default
+.MAKE.EXPAND_VARIABLES= yes
+
+# Tell bmake the makefile preference
+.MAKE.MAKEFILE_PREFERENCE= BSDmakefile makefile Makefile
+
+# By default bmake does *not* use set -e
+# when running target scripts, this is a problem for many makefiles here.
+# So define a shell that will do what FreeBSD expects.
+.ifndef WITHOUT_SHELL_ERRCTL
+.SHELL: name=sh \
+ quiet="set -" echo="set -v" filter="set -" \
+ hasErrCtl=yes check="set -e" ignore="set +e" \
+ echoFlag=v errFlag=e \
+ path=${__MAKE_SHELL:U/bin/sh}
+.endif
+
+.endif
+
.include
.include
Modified: stable/9/usr.bin/Makefile
==
--- stable/9/usr.bin/Makefile Sat Mar 15 23:09:34 2014(r263211)
+++ stable/9/usr.bin/Makefile Sat Mar 15 23:51:28 2014(r263212)
@@ -273,6 +273,7 @@ SUBDIR+=msgs
.endif
.if ${MK_MAKE} != "no"
+SUBDIR+= bmake
SUBDIR+= make
.endif
Modified: stable/9/usr.bin/bmake/Makefile.inc
==
--- stable/10/usr.bin/bmake/Makefile.incWed Mar 12 17:18:15 2014
(r263096)
+++ stable/9/usr.bin/bmake/Makefile.inc Sat Mar 15 23:51:28 2014
(r263212)
@@ -13,10 +13,6 @@
MK_BMAKE= yes
.endif
-.if defined(MK_BMAKE) && ${MK_BMAKE} != "no"
-PROG= make
-.endif
-
.if !defined(MK_SHARED_TOOLCHAIN) || ${MK_SHARED_TOOLCHAIN} == "no"
NO_SHARED?= YES
.endif
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r253879 - in vendor/NetBSD/bmake/dist: . mk unit-tests
Author: sjg
Date: Fri Aug 2 05:23:57 2013
New Revision: 253879
URL: http://svnweb.freebsd.org/changeset/base/253879
Log:
Import bmake-20130730 - allows folk to supress job tokens.
Modified:
vendor/NetBSD/bmake/dist/ChangeLog
vendor/NetBSD/bmake/dist/Makefile
vendor/NetBSD/bmake/dist/bmake.1
vendor/NetBSD/bmake/dist/bmake.cat1
vendor/NetBSD/bmake/dist/compat.c
vendor/NetBSD/bmake/dist/configure
vendor/NetBSD/bmake/dist/configure.in
vendor/NetBSD/bmake/dist/job.c
vendor/NetBSD/bmake/dist/job.h
vendor/NetBSD/bmake/dist/main.c
vendor/NetBSD/bmake/dist/make.1
vendor/NetBSD/bmake/dist/make.h
vendor/NetBSD/bmake/dist/meta.c
vendor/NetBSD/bmake/dist/mk/ChangeLog
vendor/NetBSD/bmake/dist/mk/init.mk
vendor/NetBSD/bmake/dist/mk/install-mk
vendor/NetBSD/bmake/dist/mk/lib.mk
vendor/NetBSD/bmake/dist/mk/meta2deps.py
vendor/NetBSD/bmake/dist/mk/own.mk
vendor/NetBSD/bmake/dist/mk/prog.mk
vendor/NetBSD/bmake/dist/parse.c
vendor/NetBSD/bmake/dist/unit-tests/Makefile.in
vendor/NetBSD/bmake/dist/var.c
Modified: vendor/NetBSD/bmake/dist/ChangeLog
==
--- vendor/NetBSD/bmake/dist/ChangeLog Fri Aug 2 03:46:45 2013
(r253878)
+++ vendor/NetBSD/bmake/dist/ChangeLog Fri Aug 2 05:23:57 2013
(r253879)
@@ -1,3 +1,36 @@
+2013-07-30 Simon J. Gerraty
+
+ * Makefile (MAKE_VERSION): 20130730
+ Merge with NetBSD make, pick up
+ o Allow suppression of --- job -- tokens by setting
+ .MAKE.JOB.PREFIX empty.
+
+2013-07-16 Simon J. Gerraty
+
+ * Makefile (MAKE_VERSION): 20130716
+ Merge with NetBSD make, pick up
+ o number of gmake compatability tweaks
+ -w for gmake style entering/leaving messages
+ if .MAKE.LEVEL > 0 indicate it in progname "make[1]" etc.
+ handle MAKEFLAGS containing only letters.
+ o when overriding a GLOBAL variable on the command line,
+ delete it from GLOBAL context so -V doesn't show the wrong
+ value.
+
+2013-07-06 Simon J. Gerraty
+
+ * configure.in: We don't need MAKE_LEVEL_SAFE anymore.
+
+ * Makefile (MAKE_VERSION): 20130706
+ Merge with NetBSD make, pick up
+ o Shell_Init(): export shellErrFlag if commandShell hasErrCtl is
+ true so that CompatRunCommand() can use it, to ensure
+ consistent behavior with jobs mode.
+ o use MAKE_LEVEL_ENV to define the variable to propagate
+ .MAKE.LEVEL - currently set to MAKELEVEL (same as gmake).
+ o meta.c: use .MAKE.META.IGNORE_PATHS to allow customization of
+ paths to ignore.
+
2013-06-04 Simon J. Gerraty
* Makefile (MAKE_VERSION): 20130604
Modified: vendor/NetBSD/bmake/dist/Makefile
==
--- vendor/NetBSD/bmake/dist/Makefile Fri Aug 2 03:46:45 2013
(r253878)
+++ vendor/NetBSD/bmake/dist/Makefile Fri Aug 2 05:23:57 2013
(r253879)
@@ -1,7 +1,7 @@
-# $Id: Makefile,v 1.14 2013/06/05 04:03:22 sjg Exp $
+# $Id: Makefile,v 1.17 2013/07/30 19:13:53 sjg Exp $
# Base version on src date
-MAKE_VERSION= 20130604
+MAKE_VERSION= 20130730
PROG= bmake
Modified: vendor/NetBSD/bmake/dist/bmake.1
==
--- vendor/NetBSD/bmake/dist/bmake.1Fri Aug 2 03:46:45 2013
(r253878)
+++ vendor/NetBSD/bmake/dist/bmake.1Fri Aug 2 05:23:57 2013
(r253879)
@@ -1,4 +1,4 @@
-.\"$NetBSD: make.1,v 1.213 2013/03/31 05:49:51 sjg Exp $
+.\"$NetBSD: make.1,v 1.220 2013/07/30 19:09:57 sjg Exp $
.\"
.\" Copyright (c) 1990, 1993
.\"The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\"from: @(#)make.18.4 (Berkeley) 3/19/94
.\"
-.Dd March 30, 2013
+.Dd July 30, 2013
.Dt MAKE 1
.Os
.Sh NAME
@@ -37,7 +37,7 @@
.Nd maintain program dependencies
.Sh SYNOPSIS
.Nm
-.Op Fl BeikNnqrstWX
+.Op Fl BeikNnqrstWwX
.Op Fl C Ar directory
.Op Fl D Ar variable
.Op Fl d Ar flags
@@ -209,6 +209,8 @@ Force the
option to print raw values of variables.
.It Ar v
Print debugging information about variable assignment.
+.It Ar w
+Print entering and leaving directory messages, pre and post processing.
.It Ar x
Run shell commands with
.Fl x
@@ -743,6 +745,9 @@ then output for each target is prefixed
.Ql --- target ---
the first part of which can be controlled via
.Va .MAKE.JOB.PREFIX .
+If
+.Va .MAKE.JOB.PREFIX
+is empty, no token is printed.
.br
For example:
.Li .MAKE.JOB.PREFIX=${.newline}---${.MAKE:T}[${.MAKE.PID}]
@@ -856,6 +861,11 @@ In "meta" mode, this variable contains a
used (updated or not).
This list can be used to process the meta files to extract dependency
information.
+.It Va .MAKE.META.IGNORE
svn commit: r253880 - vendor/NetBSD/bmake/20130730
Author: sjg Date: Fri Aug 2 05:25:11 2013 New Revision: 253880 URL: http://svnweb.freebsd.org/changeset/base/253880 Log: Tag bmake-20130730 Added: vendor/NetBSD/bmake/20130730/ - copied from r253879, vendor/NetBSD/bmake/dist/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r253883 - in head: contrib/bmake contrib/bmake/mk contrib/bmake/unit-tests usr.bin/bmake usr.bin/bmake/unit-tests
Author: sjg
Date: Fri Aug 2 06:25:28 2013
New Revision: 253883
URL: http://svnweb.freebsd.org/changeset/base/253883
Log:
Merge bmake-20130730
Main feature of interest is .MAKE.JOB.PREFIX=
to suppress --- job --- tokens.
Modified:
head/contrib/bmake/ChangeLog
head/contrib/bmake/Makefile
head/contrib/bmake/bmake.1
head/contrib/bmake/bmake.cat1
head/contrib/bmake/compat.c
head/contrib/bmake/configure
head/contrib/bmake/configure.in
head/contrib/bmake/job.c
head/contrib/bmake/job.h
head/contrib/bmake/main.c
head/contrib/bmake/make.1
head/contrib/bmake/make.h
head/contrib/bmake/meta.c
head/contrib/bmake/mk/ChangeLog
head/contrib/bmake/mk/init.mk
head/contrib/bmake/mk/install-mk
head/contrib/bmake/mk/lib.mk
head/contrib/bmake/mk/meta2deps.py
head/contrib/bmake/mk/own.mk
head/contrib/bmake/mk/prog.mk
head/contrib/bmake/parse.c
head/contrib/bmake/unit-tests/Makefile.in
head/contrib/bmake/var.c
head/usr.bin/bmake/Makefile
head/usr.bin/bmake/config.h
head/usr.bin/bmake/unit-tests/Makefile
Directory Properties:
head/contrib/bmake/ (props changed)
Modified: head/contrib/bmake/ChangeLog
==
--- head/contrib/bmake/ChangeLogFri Aug 2 05:52:53 2013
(r253882)
+++ head/contrib/bmake/ChangeLogFri Aug 2 06:25:28 2013
(r253883)
@@ -1,3 +1,36 @@
+2013-07-30 Simon J. Gerraty
+
+ * Makefile (MAKE_VERSION): 20130730
+ Merge with NetBSD make, pick up
+ o Allow suppression of --- job -- tokens by setting
+ .MAKE.JOB.PREFIX empty.
+
+2013-07-16 Simon J. Gerraty
+
+ * Makefile (MAKE_VERSION): 20130716
+ Merge with NetBSD make, pick up
+ o number of gmake compatability tweaks
+ -w for gmake style entering/leaving messages
+ if .MAKE.LEVEL > 0 indicate it in progname "make[1]" etc.
+ handle MAKEFLAGS containing only letters.
+ o when overriding a GLOBAL variable on the command line,
+ delete it from GLOBAL context so -V doesn't show the wrong
+ value.
+
+2013-07-06 Simon J. Gerraty
+
+ * configure.in: We don't need MAKE_LEVEL_SAFE anymore.
+
+ * Makefile (MAKE_VERSION): 20130706
+ Merge with NetBSD make, pick up
+ o Shell_Init(): export shellErrFlag if commandShell hasErrCtl is
+ true so that CompatRunCommand() can use it, to ensure
+ consistent behavior with jobs mode.
+ o use MAKE_LEVEL_ENV to define the variable to propagate
+ .MAKE.LEVEL - currently set to MAKELEVEL (same as gmake).
+ o meta.c: use .MAKE.META.IGNORE_PATHS to allow customization of
+ paths to ignore.
+
2013-06-04 Simon J. Gerraty
* Makefile (MAKE_VERSION): 20130604
Modified: head/contrib/bmake/Makefile
==
--- head/contrib/bmake/Makefile Fri Aug 2 05:52:53 2013(r253882)
+++ head/contrib/bmake/Makefile Fri Aug 2 06:25:28 2013(r253883)
@@ -1,7 +1,7 @@
-# $Id: Makefile,v 1.14 2013/06/05 04:03:22 sjg Exp $
+# $Id: Makefile,v 1.17 2013/07/30 19:13:53 sjg Exp $
# Base version on src date
-MAKE_VERSION= 20130604
+MAKE_VERSION= 20130730
PROG= bmake
Modified: head/contrib/bmake/bmake.1
==
--- head/contrib/bmake/bmake.1 Fri Aug 2 05:52:53 2013(r253882)
+++ head/contrib/bmake/bmake.1 Fri Aug 2 06:25:28 2013(r253883)
@@ -1,4 +1,4 @@
-.\"$NetBSD: make.1,v 1.213 2013/03/31 05:49:51 sjg Exp $
+.\"$NetBSD: make.1,v 1.220 2013/07/30 19:09:57 sjg Exp $
.\"
.\" Copyright (c) 1990, 1993
.\"The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\"from: @(#)make.18.4 (Berkeley) 3/19/94
.\"
-.Dd March 30, 2013
+.Dd July 30, 2013
.Dt MAKE 1
.Os
.Sh NAME
@@ -37,7 +37,7 @@
.Nd maintain program dependencies
.Sh SYNOPSIS
.Nm
-.Op Fl BeikNnqrstWX
+.Op Fl BeikNnqrstWwX
.Op Fl C Ar directory
.Op Fl D Ar variable
.Op Fl d Ar flags
@@ -209,6 +209,8 @@ Force the
option to print raw values of variables.
.It Ar v
Print debugging information about variable assignment.
+.It Ar w
+Print entering and leaving directory messages, pre and post processing.
.It Ar x
Run shell commands with
.Fl x
@@ -743,6 +745,9 @@ then output for each target is prefixed
.Ql --- target ---
the first part of which can be controlled via
.Va .MAKE.JOB.PREFIX .
+If
+.Va .MAKE.JOB.PREFIX
+is empty, no token is printed.
.br
For example:
.Li .MAKE.JOB.PREFIX=${.newline}---${.MAKE:T}[${.MAKE.PID}]
@@ -856,6 +861,11 @@ In "meta" mode, this variable contains a
used (updated or not).
This list can be used to process the meta files to extract dependency
information.
+.It Va
Re: svn commit: r253883 - in head: contrib/bmake contrib/bmake/mk contrib/bmake/unit-tests usr.bin/bmake usr.bin/bmake/unit-tests
On Fri, 2 Aug 2013 22:46:36 -0700, Rui Paulo writes: >Cool! Can we set this in /etc/make.conf ? I would expect so. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r253883 - in head: contrib/bmake contrib/bmake/mk contrib/bmake/unit-tests usr.bin/bmake usr.bin/bmake/unit-tests
On Sat, 3 Aug 2013 22:11:46 -0700, Rui Paulo writes: >On 2 Aug 2013, at 23:01, Simon J. Gerraty wrote: > >> >> On Fri, 2 Aug 2013 22:46:36 -0700, Rui Paulo writes: >>> Cool! Can we set this in /etc/make.conf ? >> >> I would expect so. > >Doesn't seem to make any effect... Ah, looks like Job_SetPrefix() is called too early, will fix. You can set it on the command line for sure. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r253925 - head/contrib/bmake
Author: sjg
Date: Sun Aug 4 07:10:16 2013
New Revision: 253925
URL: http://svnweb.freebsd.org/changeset/base/253925
Log:
Move the call to Job_SetPrefix() to Job_Init() so that
makefiles have had a chance to set .MAKE.JOB.PREFIX
Modified:
head/contrib/bmake/job.c
head/contrib/bmake/main.c
Modified: head/contrib/bmake/job.c
==
--- head/contrib/bmake/job.cSun Aug 4 06:36:17 2013(r253924)
+++ head/contrib/bmake/job.cSun Aug 4 07:10:16 2013(r253925)
@@ -2214,6 +2214,7 @@ Job_SetPrefix(void)
void
Job_Init(void)
{
+Job_SetPrefix();
/* Allocate space for all the job info */
job_table = bmake_malloc(maxJobs * sizeof *job_table);
memset(job_table, 0, maxJobs * sizeof *job_table);
Modified: head/contrib/bmake/main.c
==
--- head/contrib/bmake/main.c Sun Aug 4 06:36:17 2013(r253924)
+++ head/contrib/bmake/main.c Sun Aug 4 07:10:16 2013(r253925)
@@ -1026,7 +1026,6 @@ main(int argc, char **argv)
snprintf(pn, sizeof(pn), "%s[%d]", progname, makelevel);
progname = bmake_strdup(pn);
}
- Job_SetPrefix();
#ifdef USE_META
meta_init();
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r253887 - head/sys/dev/filemon
>> Thank you for your comments. Can you review the attached patch? If >> there is no problem, I will commit this and MFC to stable branches. Looks good. But don't commit it untested ;-) I can test it for you. >Perhaps it is best to commit this patch, but also add a warning to >filemon(4) that it should not be loaded on systems with untrusted users >or the permissions on /dev/filemon should be restricted (via >/etc/devfs.rules). That would largely defeat the purpose. This driver was written to overcome issues with dtrace: a/ it needed privs beyond normal user b/ it could not reliably provide path of binary being exec'd c/ performace #b is probably fixable, but the fix could not be relied on to exist everywhere. This driver looks at a very limited set of syscalls, and does not report anything beyond pathnames read/written/exec'd. In the NetBSD version I even dropped stat calls as being unnecessary (for make). dtrace would meet many of Robert's criteria for a general purpose functionality but allows far more functionality, and apart from the issues above, cannot (I'm told) be ported to linux. A simple driver like this can be. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r253887 - head/sys/dev/filemon
On Mon, 5 Aug 2013 13:22:06 +0900, Hiroki Sato writes: >"Simon J. Gerraty" wrote > in <20130804151754.8189758...@chaos.jnpr.net>: >sj> I can test it for you. > > Okay, I will wait for the results. Seems to work ok. Thanks --sjg ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r254194 - in head: contrib/bmake usr.bin/bmake
Author: sjg
Date: Sat Aug 10 21:31:35 2013
New Revision: 254194
URL: http://svnweb.freebsd.org/changeset/base/254194
Log:
ParseGetLine: don't treat a zero byte as end of buffer if P_end says it isn't.
Consume up to next newline, and issue a parse warning.
If no newline found before P_end, carry on as before.
Modified:
head/contrib/bmake/parse.c
head/usr.bin/bmake/Makefile
Modified: head/contrib/bmake/parse.c
==
--- head/contrib/bmake/parse.c Sat Aug 10 21:13:18 2013(r254193)
+++ head/contrib/bmake/parse.c Sat Aug 10 21:31:35 2013(r254194)
@@ -2582,6 +2582,16 @@ ParseGetLine(int flags, int *length)
if (cf->P_end == NULL)
/* End of string (aka for loop) data */
break;
+ /* see if there is more we can parse */
+ while (ptr++ < cf->P_end) {
+ if ((ch = *ptr) == '\n') {
+ if (ptr > line && ptr[-1] == '\\')
+ continue;
+ Parse_Error(PARSE_WARNING,
+ "Zero byte read from file, skipping rest of line.");
+ break;
+ }
+ }
if (cf->nextbuf != NULL) {
/*
* End of this buffer; return EOF and outer logic
Modified: head/usr.bin/bmake/Makefile
==
--- head/usr.bin/bmake/Makefile Sat Aug 10 21:13:18 2013(r254193)
+++ head/usr.bin/bmake/Makefile Sat Aug 10 21:31:35 2013(r254194)
@@ -17,7 +17,7 @@ CLEANFILES+= bootstrap
# $Id: Makefile,v 1.17 2013/07/30 19:13:53 sjg Exp $
# Base version on src date
-MAKE_VERSION= 20130730
+MAKE_VERSION= 20130810
PROG?= ${.CURDIR:T}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r254340 - head/sys/conf
Author: sjg
Date: Wed Aug 14 22:19:29 2013
New Revision: 254340
URL: http://svnweb.freebsd.org/changeset/base/254340
Log:
Some objects - such as *_genassym.o are not hooked into
SRCS OBJS or anything else, yet have a dependency on symlinks
such as machine/
Reviewed by: obrien
Modified:
head/sys/conf/kern.post.mk
Modified: head/sys/conf/kern.post.mk
==
--- head/sys/conf/kern.post.mk Wed Aug 14 21:59:48 2013(r254339)
+++ head/sys/conf/kern.post.mk Wed Aug 14 22:19:29 2013(r254340)
@@ -219,7 +219,7 @@ _ILINKS+= x86
# Ensure that the link exists without depending on it when it exists.
.for _link in ${_ILINKS}
.if !exists(${.OBJDIR}/${_link})
-${SRCS}: ${_link}
+${SRCS} ${CLEAN:M*.o}: ${_link}
.endif
.endfor
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r254417 - head
Author: sjg
Date: Fri Aug 16 16:26:23 2013
New Revision: 254417
URL: http://svnweb.freebsd.org/changeset/base/254417
Log:
When we need to build using the in-tree make,
switch at the earliest opportunity.
In the case of fmake vs bmake, this helps ensure correct load handling.
Reviewed by: obrien
Modified:
head/Makefile
Modified: head/Makefile
==
--- head/Makefile Fri Aug 16 16:14:32 2013(r254416)
+++ head/Makefile Fri Aug 16 16:26:23 2013(r254417)
@@ -242,6 +242,7 @@ cleanworld:
# skip this for -n to avoid changing previous behavior of
# 'make -n buildworld' etc.
${TGTS}: .MAKE
+tinderbox toolchains kernel-toolchains: .MAKE
.endif
${TGTS}:
@@ -353,14 +354,16 @@ make bmake: .PHONY
${MMAKE} all && \
${MMAKE} install DESTDIR=${MYMAKE:H} BINDIR=
PROGNAME=${MYMAKE:T}
+tinderbox toolchains kernel-toolchains: upgrade_checks
+
tinderbox:
- @cd ${.CURDIR} && ${MAKE} DOING_TINDERBOX=YES universe
+ @cd ${.CURDIR} && ${SUB_MAKE} DOING_TINDERBOX=YES universe
toolchains:
- @cd ${.CURDIR} && ${MAKE} UNIVERSE_TARGET=toolchain universe
+ @cd ${.CURDIR} && ${SUB_MAKE} UNIVERSE_TARGET=toolchain universe
kernel-toolchains:
- @cd ${.CURDIR} && ${MAKE} UNIVERSE_TARGET=kernel-toolchain universe
+ @cd ${.CURDIR} && ${SUB_MAKE} UNIVERSE_TARGET=kernel-toolchain universe
#
# universe
@@ -419,7 +422,7 @@ universe_${target}_prologue: universe_pr
.if !defined(MAKE_JUST_KERNELS)
.for target_arch in ${TARGET_ARCHES_${target}}
universe_${target}: universe_${target}_${target_arch}
-universe_${target}_${target_arch}: universe_${target}_prologue
+universe_${target}_${target_arch}: universe_${target}_prologue .MAKE
@echo ">> ${target}.${target_arch} ${UNIVERSE_TARGET} started on
`LC_ALL=C date`"
@(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \
${SUB_MAKE} ${JFLAG} ${UNIVERSE_TARGET} \
@@ -440,7 +443,7 @@ universe_${target}_kernels: universe_${t
.endfor
.endif
universe_${target}: universe_${target}_kernels
-universe_${target}_kernels: universe_${target}_prologue
+universe_${target}_kernels: universe_${target}_prologue .MAKE
.if exists(${KERNSRCDIR}/${target}/conf/NOTES)
@(cd ${KERNSRCDIR}/${target}/conf && env __MAKE_CONF=/dev/null \
${SUB_MAKE} LINT > ${.CURDIR}/_.${target}.makeLINT 2>&1 || \
@@ -468,7 +471,7 @@ TARGET_ARCH_${kernel}!= cd ${KERNSRCDIR}
.error "Target architecture for ${TARGET}/conf/${kernel} unknown. config(8)
likely too old."
.endif
universe_kernconfs: universe_kernconf_${TARGET}_${kernel}
-universe_kernconf_${TARGET}_${kernel}:
+universe_kernconf_${TARGET}_${kernel}: .MAKE
@(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \
${SUB_MAKE} ${JFLAG} buildkernel \
TARGET=${TARGET} \
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r254419 - head/contrib/bmake
Author: sjg
Date: Fri Aug 16 18:47:18 2013
New Revision: 254419
URL: http://svnweb.freebsd.org/changeset/base/254419
Log:
Add .MAKE.ALWAYS_PASS_JOB_QUEUE knob (default yes)
for backwards compatability.
Modified:
head/contrib/bmake/job.c
head/contrib/bmake/make.1
Modified: head/contrib/bmake/job.c
==
--- head/contrib/bmake/job.cFri Aug 16 16:55:39 2013(r254418)
+++ head/contrib/bmake/job.cFri Aug 16 18:47:18 2013(r254419)
@@ -172,6 +172,14 @@ __RCSID("$NetBSD: job.c,v 1.175 2013/07/
# define STATIC static
/*
+ * FreeBSD: traditionally .MAKE is not required to
+ * pass jobs queue to sub-makes.
+ * Use .MAKE.ALWAYS_PASS_JOB_QUEUE=no to disable.
+ */
+#define MAKE_ALWAYS_PASS_JOB_QUEUE ".MAKE.ALWAYS_PASS_JOB_QUEUE"
+static int Always_pass_job_queue = TRUE;
+
+/*
* error handling variables
*/
static int errors = 0; /* number of errors reported */
@@ -1360,7 +1368,7 @@ JobExec(Job *job, char **argv)
(void)fcntl(0, F_SETFD, 0);
(void)lseek(0, (off_t)0, SEEK_SET);
- if (job->node->type & OP_MAKE) {
+ if (Always_pass_job_queue || (job->node->type & OP_MAKE)) {
/*
* Pass job token pipe to submakes.
*/
@@ -2226,6 +2234,9 @@ Job_Init(void)
lastNode = NULL;
+Always_pass_job_queue = getBoolean(MAKE_ALWAYS_PASS_JOB_QUEUE,
+ Always_pass_job_queue);
+
/*
* There is a non-zero chance that we already have children.
* eg after 'make -f-
Re: svn commit: r254419 - head/contrib/bmake
On Fri, 16 Aug 2013 11:56:24 -0700, Juli Mallett writes: >> Log: >> Add .MAKE.ALWAYS_PASS_JOB_QUEUE knob (default yes) >> for backwards compatability. >> > >Thanks very much. Do you have some sense of when/if this might switch to a >default of "no"? If so, it seems like it might be good to note that >dependence on that behaviour is deprecated and will be removed in >11.0-RELEASE or whenever you think appropriate. Right now I don't see any compelling reason to change it to "no". So, no timeline. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r254437 - head
Author: sjg
Date: Sat Aug 17 04:41:35 2013
New Revision: 254437
URL: http://svnweb.freebsd.org/changeset/base/254437
Log:
Don't let user specified DESTDIR, break building our chosen make.
Modified:
head/Makefile
Modified: head/Makefile
==
--- head/Makefile Sat Aug 17 01:17:51 2013(r254436)
+++ head/Makefile Sat Aug 17 04:41:35 2013(r254437)
@@ -349,9 +349,9 @@ make bmake: .PHONY
@echo ">>> Building an up-to-date make(1)"
@echo "--"
${_+_}@cd ${.CURDIR}/usr.bin/${.TARGET}; \
- ${MMAKE} obj && \
- ${MMAKE} depend && \
- ${MMAKE} all && \
+ ${MMAKE} obj DESTDIR= && \
+ ${MMAKE} depend DESTDIR= && \
+ ${MMAKE} all DESTDIR= && \
${MMAKE} install DESTDIR=${MYMAKE:H} BINDIR=
PROGNAME=${MYMAKE:T}
tinderbox toolchains kernel-toolchains: upgrade_checks
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r254980 - head/share/mk
Author: sjg
Date: Tue Aug 27 23:09:34 2013
New Revision: 254980
URL: http://svnweb.freebsd.org/changeset/base/254980
Log:
Use .SHELL to tell bmake to use 'set -e' when running scripts
since most FreeBSD makefiles it is in effect.
Move the other bmake compatability knobs out of the POSIX block.
Reviewed by: obrien
Modified:
head/share/mk/sys.mk
Modified: head/share/mk/sys.mk
==
--- head/share/mk/sys.mkTue Aug 27 23:02:20 2013(r254979)
+++ head/share/mk/sys.mkTue Aug 27 23:09:34 2013(r254980)
@@ -332,12 +332,6 @@ SHELL= ${__MAKE_SHELL}
.SHELL: path=${__MAKE_SHELL}
.endif
-# Tell bmake to expand -V VAR by default
-.MAKE.EXPAND_VARIABLES= yes
-
-# Tell bmake the makefile preference
-.MAKE.MAKEFILE_PREFERENCE= BSDmakefile makefile Makefile
-
.if !defined(.PARSEDIR)
# We are not bmake, which is more aggressive about searching .PATH
# It is sometime necessary to curb its enthusiasm with .NOPATH
@@ -351,4 +345,24 @@ SHELL= ${__MAKE_SHELL}
.endif
+.if defined(.PARSEDIR)
+# Tell bmake to expand -V VAR by default
+.MAKE.EXPAND_VARIABLES= yes
+
+# Tell bmake the makefile preference
+.MAKE.MAKEFILE_PREFERENCE= BSDmakefile makefile Makefile
+
+# By default bmake does *not* use set -e
+# when running target scripts, this is a problem for many makefiles here.
+# So define a shell that will do what FreeBSD expects.
+.ifndef WITHOUT_SHELL_ERRCTL
+.SHELL: name=sh \
+ quiet="set -" echo="set -v" filter="set -" \
+ hasErrCtl=yes check="set -e" ignore="set +e" \
+ echoFlag=v errFlag=e \
+ path=${__MAKE_SHELL:U/bin/sh}
+.endif
+
+.endif
+
.include
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r255127 - head/contrib/bmake
Author: sjg
Date: Sun Sep 1 18:59:09 2013
New Revision: 255127
URL: http://svnweb.freebsd.org/changeset/base/255127
Log:
Pay attention to errCheck!
PR: 181715
Modified:
head/contrib/bmake/compat.c
Modified: head/contrib/bmake/compat.c
==
--- head/contrib/bmake/compat.c Sun Sep 1 17:37:19 2013(r255126)
+++ head/contrib/bmake/compat.c Sun Sep 1 18:59:09 2013(r255127)
@@ -340,7 +340,7 @@ again:
/*
* The following work for any of the builtin shell specs.
*/
- if (shellErrFlag) {
+ if (errCheck && shellErrFlag) {
shargv[shargc++] = shellErrFlag;
}
if (DEBUG(SHELL))
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r255251 - vendor/NetBSD/bmake/20130904
Author: sjg Date: Thu Sep 5 15:49:51 2013 New Revision: 255251 URL: http://svnweb.freebsd.org/changeset/base/255251 Log: Tag bmake-20130904 Added: vendor/NetBSD/bmake/20130904/ - copied from r255250, vendor/NetBSD/bmake/dist/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r255250 - in vendor/NetBSD/bmake/dist: . mk unit-tests
Author: sjg Date: Thu Sep 5 15:49:22 2013 New Revision: 255250 URL: http://svnweb.freebsd.org/changeset/base/255250 Log: Import bmake-20130904 Added: vendor/NetBSD/bmake/dist/unit-tests/sunshcmd Modified: vendor/NetBSD/bmake/dist/ChangeLog vendor/NetBSD/bmake/dist/FILES vendor/NetBSD/bmake/dist/Makefile vendor/NetBSD/bmake/dist/bmake.1 vendor/NetBSD/bmake/dist/bmake.cat1 vendor/NetBSD/bmake/dist/compat.c vendor/NetBSD/bmake/dist/job.c vendor/NetBSD/bmake/dist/main.c vendor/NetBSD/bmake/dist/make.1 vendor/NetBSD/bmake/dist/make.h vendor/NetBSD/bmake/dist/mk/ChangeLog vendor/NetBSD/bmake/dist/mk/gendirdeps.mk vendor/NetBSD/bmake/dist/mk/install-mk vendor/NetBSD/bmake/dist/mk/libs.mk vendor/NetBSD/bmake/dist/mk/progs.mk vendor/NetBSD/bmake/dist/parse.c vendor/NetBSD/bmake/dist/unit-tests/Makefile.in vendor/NetBSD/bmake/dist/unit-tests/test.exp vendor/NetBSD/bmake/dist/var.c Modified: vendor/NetBSD/bmake/dist/ChangeLog == --- vendor/NetBSD/bmake/dist/ChangeLog Thu Sep 5 14:26:37 2013 (r255249) +++ vendor/NetBSD/bmake/dist/ChangeLog Thu Sep 5 15:49:22 2013 (r255250) @@ -1,3 +1,24 @@ +2013-09-04 Simon J. Gerraty + + * Makefile (MAKE_VERSION): 20130904 + Merge with NetBSD make, pick up + o Add VAR_INTERNAL context, so that internal setting of + MAKEFILE does not override value set by makefiles. + +2013-09-02 Simon J. Gerraty + + * Makefile (MAKE_VERSION): 20130902 + Merge with NetBSD make, pick up + o CompatRunCommand: only apply shellErrFlag when errCheck is true + +2013-08-28 Simon J. Gerraty + + * Makefile (MAKE_VERSION): 20130828 + Merge with NetBSD make, pick up + o Fix VAR :sh = syntax from Will Andrews at freebsd.org + o Call Job_SetPrefix() from Job_Init() so makefiles have + opportunity to set .MAKE.JOB.PREFIX + 2013-07-30 Simon J. Gerraty * Makefile (MAKE_VERSION): 20130730 Modified: vendor/NetBSD/bmake/dist/FILES == --- vendor/NetBSD/bmake/dist/FILES Thu Sep 5 14:26:37 2013 (r255249) +++ vendor/NetBSD/bmake/dist/FILES Thu Sep 5 15:49:22 2013 (r255250) @@ -114,6 +114,7 @@ unit-tests/order unit-tests/phony-end unit-tests/posix unit-tests/qequals +unit-tests/sunshcmd unit-tests/sysv unit-tests/ternary unit-tests/test.exp Modified: vendor/NetBSD/bmake/dist/Makefile == --- vendor/NetBSD/bmake/dist/Makefile Thu Sep 5 14:26:37 2013 (r255249) +++ vendor/NetBSD/bmake/dist/Makefile Thu Sep 5 15:49:22 2013 (r255250) @@ -1,7 +1,7 @@ -# $Id: Makefile,v 1.17 2013/07/30 19:13:53 sjg Exp $ +# $Id: Makefile,v 1.20 2013/09/04 15:42:03 sjg Exp $ # Base version on src date -MAKE_VERSION= 20130730 +MAKE_VERSION= 20130904 PROG= bmake Modified: vendor/NetBSD/bmake/dist/bmake.1 == --- vendor/NetBSD/bmake/dist/bmake.1Thu Sep 5 14:26:37 2013 (r255249) +++ vendor/NetBSD/bmake/dist/bmake.1Thu Sep 5 15:49:22 2013 (r255250) @@ -1,4 +1,4 @@ -.\"$NetBSD: make.1,v 1.220 2013/07/30 19:09:57 sjg Exp $ +.\"$NetBSD: make.1,v 1.222 2013/08/11 09:53:49 apb Exp $ .\" .\" Copyright (c) 1990, 1993 .\"The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\"from: @(#)make.18.4 (Berkeley) 3/19/94 .\" -.Dd July 30, 2013 +.Dd August 11, 2013 .Dt MAKE 1 .Os .Sh NAME @@ -1971,6 +1971,12 @@ If the source is the special .Ic .DOTLAST target, then the current working directory is searched last. +.It Ic .PATH. Ns Va suffix +Like +.Ic .PATH +but applies only to files with a particular suffix. +The suffix must have been previously declared with +.Ic .SUFFIXES . .It Ic .PHONY Apply the .Ic .PHONY Modified: vendor/NetBSD/bmake/dist/bmake.cat1 == --- vendor/NetBSD/bmake/dist/bmake.cat1 Thu Sep 5 14:26:37 2013 (r255249) +++ vendor/NetBSD/bmake/dist/bmake.cat1 Thu Sep 5 15:49:22 2013 (r255250) @@ -1257,6 +1257,10 @@ SSPPEECCIIAALL TTAARRGGEETT source is the special ..DDOOTTLLAASSTT target, then the current working directory is searched last. + ..PPAATTHH.._s_u_f_f_i_x + Like ..PPAATTHH but applies only to files with a particular suffix. + The suffix must have been previously declared with ..SSUUFFFFIIXXEESS. + ..PPHHOONNYY Apply the ..PPHHOONNYY attribute to any specified sources. ..PPRREECCIIOOUUSS @@ -1374,4 +1378,4 @@
svn commit: r255253 - in head: contrib/bmake contrib/bmake/mk contrib/bmake/unit-tests usr.bin/bmake usr.bin/bmake/unit-tests
Author: sjg Date: Thu Sep 5 15:57:26 2013 New Revision: 255253 URL: http://svnweb.freebsd.org/changeset/base/255253 Log: Merge bmake-20130904 Added: head/contrib/bmake/unit-tests/sunshcmd - copied unchanged from r255252, vendor/NetBSD/bmake/dist/unit-tests/sunshcmd Modified: head/contrib/bmake/ChangeLog head/contrib/bmake/FILES head/contrib/bmake/Makefile head/contrib/bmake/bmake.1 head/contrib/bmake/bmake.cat1 head/contrib/bmake/compat.c head/contrib/bmake/job.c head/contrib/bmake/main.c head/contrib/bmake/make.1 head/contrib/bmake/make.h head/contrib/bmake/mk/ChangeLog head/contrib/bmake/mk/gendirdeps.mk head/contrib/bmake/mk/install-mk head/contrib/bmake/mk/libs.mk head/contrib/bmake/mk/progs.mk head/contrib/bmake/parse.c head/contrib/bmake/unit-tests/Makefile.in head/contrib/bmake/unit-tests/test.exp head/contrib/bmake/var.c head/usr.bin/bmake/Makefile head/usr.bin/bmake/unit-tests/Makefile Directory Properties: head/contrib/bmake/ (props changed) Modified: head/contrib/bmake/ChangeLog == --- head/contrib/bmake/ChangeLogThu Sep 5 15:50:34 2013 (r255252) +++ head/contrib/bmake/ChangeLogThu Sep 5 15:57:26 2013 (r255253) @@ -1,3 +1,24 @@ +2013-09-04 Simon J. Gerraty + + * Makefile (MAKE_VERSION): 20130904 + Merge with NetBSD make, pick up + o Add VAR_INTERNAL context, so that internal setting of + MAKEFILE does not override value set by makefiles. + +2013-09-02 Simon J. Gerraty + + * Makefile (MAKE_VERSION): 20130902 + Merge with NetBSD make, pick up + o CompatRunCommand: only apply shellErrFlag when errCheck is true + +2013-08-28 Simon J. Gerraty + + * Makefile (MAKE_VERSION): 20130828 + Merge with NetBSD make, pick up + o Fix VAR :sh = syntax from Will Andrews at freebsd.org + o Call Job_SetPrefix() from Job_Init() so makefiles have + opportunity to set .MAKE.JOB.PREFIX + 2013-07-30 Simon J. Gerraty * Makefile (MAKE_VERSION): 20130730 Modified: head/contrib/bmake/FILES == --- head/contrib/bmake/FILESThu Sep 5 15:50:34 2013(r255252) +++ head/contrib/bmake/FILESThu Sep 5 15:57:26 2013(r255253) @@ -114,6 +114,7 @@ unit-tests/order unit-tests/phony-end unit-tests/posix unit-tests/qequals +unit-tests/sunshcmd unit-tests/sysv unit-tests/ternary unit-tests/test.exp Modified: head/contrib/bmake/Makefile == --- head/contrib/bmake/Makefile Thu Sep 5 15:50:34 2013(r255252) +++ head/contrib/bmake/Makefile Thu Sep 5 15:57:26 2013(r255253) @@ -1,7 +1,7 @@ -# $Id: Makefile,v 1.17 2013/07/30 19:13:53 sjg Exp $ +# $Id: Makefile,v 1.20 2013/09/04 15:42:03 sjg Exp $ # Base version on src date -MAKE_VERSION= 20130730 +MAKE_VERSION= 20130904 PROG= bmake Modified: head/contrib/bmake/bmake.1 == --- head/contrib/bmake/bmake.1 Thu Sep 5 15:50:34 2013(r255252) +++ head/contrib/bmake/bmake.1 Thu Sep 5 15:57:26 2013(r255253) @@ -1,4 +1,4 @@ -.\"$NetBSD: make.1,v 1.220 2013/07/30 19:09:57 sjg Exp $ +.\"$NetBSD: make.1,v 1.222 2013/08/11 09:53:49 apb Exp $ .\" .\" Copyright (c) 1990, 1993 .\"The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\"from: @(#)make.18.4 (Berkeley) 3/19/94 .\" -.Dd July 30, 2013 +.Dd August 11, 2013 .Dt MAKE 1 .Os .Sh NAME @@ -1971,6 +1971,12 @@ If the source is the special .Ic .DOTLAST target, then the current working directory is searched last. +.It Ic .PATH. Ns Va suffix +Like +.Ic .PATH +but applies only to files with a particular suffix. +The suffix must have been previously declared with +.Ic .SUFFIXES . .It Ic .PHONY Apply the .Ic .PHONY Modified: head/contrib/bmake/bmake.cat1 == --- head/contrib/bmake/bmake.cat1 Thu Sep 5 15:50:34 2013 (r255252) +++ head/contrib/bmake/bmake.cat1 Thu Sep 5 15:57:26 2013 (r255253) @@ -1257,6 +1257,10 @@ SSPPEECCIIAALL TTAARRGGEETT source is the special ..DDOOTTLLAASSTT target, then the current working directory is searched last. + ..PPAATTHH.._s_u_f_f_i_x + Like ..PPAATTHH but applies only to files with a particular suffix. + The suffix must have been previously declared with ..SSUUFFFFIIXXEESS. + ..PPHHOONNYY Apply the ..PPHHOONNYY attribute to any specified sources. ..PPRREECCIIOOUUSS @@ -1374,4 +13
svn commit: r255285 - head/contrib/bmake
Author: sjg
Date: Fri Sep 6 02:55:51 2013
New Revision: 255285
URL: http://svnweb.freebsd.org/changeset/base/255285
Log:
If MAKE_JOB_ERROR_TOKEN is set to false, do not put an error token ("E")
into the job queue.
This avoids closing down an entire build on failure of one branch.
Probably has no use outside the context of universe/tinderbox.
Reviewed by: obrien
Modified:
head/contrib/bmake/job.c
Modified: head/contrib/bmake/job.c
==
--- head/contrib/bmake/job.cFri Sep 6 02:34:34 2013(r255284)
+++ head/contrib/bmake/job.cFri Sep 6 02:55:51 2013(r255285)
@@ -178,6 +178,14 @@ __RCSID("$NetBSD: job.c,v 1.176 2013/08/
*/
#define MAKE_ALWAYS_PASS_JOB_QUEUE ".MAKE.ALWAYS_PASS_JOB_QUEUE"
static int Always_pass_job_queue = TRUE;
+/*
+ * FreeBSD: aborting entire parallel make isn't always
+ * desired. When doing tinderbox for example, failure of
+ * one architecture should not stop all.
+ * We still want to bail on interrupt though.
+ */
+#define MAKE_JOB_ERROR_TOKEN "MAKE_JOB_ERROR_TOKEN"
+static int Job_error_token = TRUE;
/*
* error handling variables
@@ -2237,6 +2245,9 @@ Job_Init(void)
Always_pass_job_queue = getBoolean(MAKE_ALWAYS_PASS_JOB_QUEUE,
Always_pass_job_queue);
+Job_error_token = getBoolean(MAKE_JOB_ERROR_TOKEN, Job_error_token);
+
+
/*
* There is a non-zero chance that we already have children.
* eg after 'make -f-
svn commit: r255286 - head
Author: sjg
Date: Fri Sep 6 02:57:15 2013
New Revision: 255286
URL: http://svnweb.freebsd.org/changeset/base/255286
Log:
During universe/tinderbox export MAKE_JOB_ERROR_TOKEN=no
This avoids aborting everything when one kernel fails.
Reviewed by: obrien
Modified:
head/Makefile
Modified: head/Makefile
==
--- head/Makefile Fri Sep 6 02:55:51 2013(r255285)
+++ head/Makefile Fri Sep 6 02:57:15 2013(r255286)
@@ -498,3 +498,11 @@ universe_epilogue:
buildLINT:
${MAKE} -C ${.CURDIR}/sys/${_TARGET}/conf LINT
+
+.if defined(.PARSEDIR)
+.if make(universe)
+# we do not want a failure of one branch abort all.
+MAKE_JOB_ERROR_TOKEN= no
+.export MAKE_JOB_ERROR_TOKEN
+.endif
+.endif
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r255463 - head/usr.bin/bmake
Author: sjg
Date: Tue Sep 10 23:31:38 2013
New Revision: 255463
URL: http://svnweb.freebsd.org/changeset/base/255463
Log:
Stick to traditional DEFAULT_SYS_PATH (/usr/share/mk)
Reviewed by: obrien
Approved by: re
Modified:
head/usr.bin/bmake/Makefile
Modified: head/usr.bin/bmake/Makefile
==
--- head/usr.bin/bmake/Makefile Tue Sep 10 22:40:38 2013(r255462)
+++ head/usr.bin/bmake/Makefile Tue Sep 10 23:31:38 2013(r255463)
@@ -167,6 +167,7 @@ accept test:
# override some simple things
BINDIR= /usr/bin
MANDIR= /usr/share/man/man
+DEFAULT_SYS_PATH= /usr/share/mk
# make sure we get this
CFLAGS+= ${COPTS.${.IMPSRC:T}}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r261182 - in vendor/NetBSD/bmake/dist: . lst.lib mk
Author: sjg
Date: Sun Jan 26 07:40:17 2014
New Revision: 261182
URL: http://svnweb.freebsd.org/changeset/base/261182
Log:
Import bmake-20140101
Modified:
vendor/NetBSD/bmake/dist/ChangeLog
vendor/NetBSD/bmake/dist/Makefile
vendor/NetBSD/bmake/dist/Makefile.config.in
vendor/NetBSD/bmake/dist/bmake.1
vendor/NetBSD/bmake/dist/bmake.cat1
vendor/NetBSD/bmake/dist/boot-strap
vendor/NetBSD/bmake/dist/compat.c
vendor/NetBSD/bmake/dist/configure
vendor/NetBSD/bmake/dist/configure.in
vendor/NetBSD/bmake/dist/hash.c
vendor/NetBSD/bmake/dist/lst.lib/lstMember.c
vendor/NetBSD/bmake/dist/main.c
vendor/NetBSD/bmake/dist/make-bootstrap.sh.in
vendor/NetBSD/bmake/dist/make.1
vendor/NetBSD/bmake/dist/make.h
vendor/NetBSD/bmake/dist/meta.c
vendor/NetBSD/bmake/dist/mk/ChangeLog
vendor/NetBSD/bmake/dist/mk/dirdeps.mk
vendor/NetBSD/bmake/dist/mk/install-mk
vendor/NetBSD/bmake/dist/mk/meta2deps.py
vendor/NetBSD/bmake/dist/parse.c
vendor/NetBSD/bmake/dist/util.c
Modified: vendor/NetBSD/bmake/dist/ChangeLog
==
--- vendor/NetBSD/bmake/dist/ChangeLog Sun Jan 26 07:20:32 2014
(r261181)
+++ vendor/NetBSD/bmake/dist/ChangeLog Sun Jan 26 07:40:17 2014
(r261182)
@@ -1,3 +1,37 @@
+2014-01-03 Simon J. Gerraty
+
+ * boot-strap: ignore mksrc=none
+
+2014-01-02 Simon J. Gerraty
+
+ * Makefile (DEFAULT_SYS_PATH?): use just ${prefix}/share/mk
+
+2014-01-01 Simon J. Gerraty
+
+ * Makefile (MAKE_VERSION): 20140101
+ * configure.in: set bmake_path_max to min(_SC_PATH_MAX,1024)
+ * Makefile.config: defined BMAKE_PATH_MAX to bmake_path_max
+ * make.h: use BMAKE_PATH_MAX if MAXPATHLEN not defined (needed for
+ Hurd)
+ * configure.in: Add AC_PREREQ and check for
+ sysctl; patch from Andrew Shadura andrewsh at debian.org
+
+2013-10-16 Simon J. Gerraty
+
+ * Makefile (MAKE_VERSION): 20131010
+ * lose the const from arg to systcl to avoid problems on older BSDs.
+
+2013-10-01 Simon J. Gerraty
+
+ * Makefile (MAKE_VERSION): 20131001
+ Merge with NetBSD make, pick up
+ o main.c: for NATIVE build sysctl to get MACHINE_ARCH from
+ hw.machine_arch if necessary.
+ o meta.c: meta_oodate - need to look at src of Link and target
+ of Move as well.
+ * main.c: check that CTL_HW and HW_MACHINE_ARCH exist.
+ provide __arraycount() if needed.
+
2013-09-04 Simon J. Gerraty
* Makefile (MAKE_VERSION): 20130904
Modified: vendor/NetBSD/bmake/dist/Makefile
==
--- vendor/NetBSD/bmake/dist/Makefile Sun Jan 26 07:20:32 2014
(r261181)
+++ vendor/NetBSD/bmake/dist/Makefile Sun Jan 26 07:40:17 2014
(r261182)
@@ -1,7 +1,7 @@
-# $Id: Makefile,v 1.20 2013/09/04 15:42:03 sjg Exp $
+# $Id: Makefile,v 1.23 2014/01/02 22:20:52 sjg Exp $
# Base version on src date
-MAKE_VERSION= 20130904
+MAKE_VERSION= 20140101
PROG= bmake
@@ -68,7 +68,7 @@ SRCS+= ${LIBOBJS:T:.o=.c}
prefix?= /usr
srcdir?= ${.CURDIR}
-DEFAULT_SYS_PATH?= .../share/mk:${prefix}/share/mk
+DEFAULT_SYS_PATH?= ${prefix}/share/mk
CPPFLAGS+= -DUSE_META
CFLAGS+= ${CPPFLAGS}
Modified: vendor/NetBSD/bmake/dist/Makefile.config.in
==
--- vendor/NetBSD/bmake/dist/Makefile.config.in Sun Jan 26 07:20:32 2014
(r261181)
+++ vendor/NetBSD/bmake/dist/Makefile.config.in Sun Jan 26 07:40:17 2014
(r261182)
@@ -14,3 +14,7 @@ LIBOBJS= @LIBOBJS@
LDADD= @LIBS@
USE_META= @use_meta@
FILEMON_H= @filemon_h@
+BMAKE_PATH_MAX?= @bmake_path_max@
+# used if MAXPATHLEN not defined
+CPPFLAGS+= -DBMAKE_PATH_MAX=${BMAKE_PATH_MAX}
+
Modified: vendor/NetBSD/bmake/dist/bmake.1
==
--- vendor/NetBSD/bmake/dist/bmake.1Sun Jan 26 07:20:32 2014
(r261181)
+++ vendor/NetBSD/bmake/dist/bmake.1Sun Jan 26 07:40:17 2014
(r261182)
@@ -1,4 +1,4 @@
-.\"$NetBSD: make.1,v 1.222 2013/08/11 09:53:49 apb Exp $
+.\"$NetBSD: make.1,v 1.226 2013/11/07 18:50:46 dholland Exp $
.\"
.\" Copyright (c) 1990, 1993
.\"The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\"from: @(#)make.18.4 (Berkeley) 3/19/94
.\"
-.Dd August 11, 2013
+.Dd October 25, 2013
.Dt MAKE 1
.Os
.Sh NAME
@@ -745,7 +745,7 @@ then output for each target is prefixed
.Ql --- target ---
the first part of which can be controlled via
.Va .MAKE.JOB.PREFIX .
-If
+If
.Va .MAKE.JOB.PREFIX
is empty, no token is printed.
.br
@@ -1066,6 +1066,13 @@ may
be used.
The wildcard characters may be escaped with a backslash
.Pq Ql \e .
+As a consequence of the way values are split into words, mat
svn commit: r261183 - vendor/NetBSD/bmake/20140101
Author: sjg Date: Sun Jan 26 07:40:56 2014 New Revision: 261183 URL: http://svnweb.freebsd.org/changeset/base/261183 Log: Tag 20140101 Added: vendor/NetBSD/bmake/20140101/ - copied from r261182, vendor/NetBSD/bmake/dist/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r261212 - in head: contrib/bmake contrib/bmake/lst.lib contrib/bmake/mk usr.bin/bmake
Author: sjg
Date: Mon Jan 27 17:47:21 2014
New Revision: 261212
URL: http://svnweb.freebsd.org/changeset/base/261212
Log:
Merge bmake-20140101 from vendor
Modified:
head/contrib/bmake/ChangeLog
head/contrib/bmake/Makefile
head/contrib/bmake/Makefile.config.in
head/contrib/bmake/bmake.1
head/contrib/bmake/bmake.cat1
head/contrib/bmake/boot-strap
head/contrib/bmake/compat.c
head/contrib/bmake/configure
head/contrib/bmake/configure.in
head/contrib/bmake/hash.c
head/contrib/bmake/lst.lib/lstMember.c
head/contrib/bmake/main.c
head/contrib/bmake/make-bootstrap.sh.in
head/contrib/bmake/make.1
head/contrib/bmake/make.h
head/contrib/bmake/meta.c
head/contrib/bmake/mk/ChangeLog
head/contrib/bmake/mk/dirdeps.mk
head/contrib/bmake/mk/install-mk
head/contrib/bmake/mk/meta2deps.py
head/contrib/bmake/parse.c
head/contrib/bmake/util.c
head/usr.bin/bmake/Makefile
head/usr.bin/bmake/Makefile.config
head/usr.bin/bmake/config.h
Directory Properties:
head/contrib/bmake/ (props changed)
Modified: head/contrib/bmake/ChangeLog
==
--- head/contrib/bmake/ChangeLogMon Jan 27 17:31:21 2014
(r261211)
+++ head/contrib/bmake/ChangeLogMon Jan 27 17:47:21 2014
(r261212)
@@ -1,3 +1,37 @@
+2014-01-03 Simon J. Gerraty
+
+ * boot-strap: ignore mksrc=none
+
+2014-01-02 Simon J. Gerraty
+
+ * Makefile (DEFAULT_SYS_PATH?): use just ${prefix}/share/mk
+
+2014-01-01 Simon J. Gerraty
+
+ * Makefile (MAKE_VERSION): 20140101
+ * configure.in: set bmake_path_max to min(_SC_PATH_MAX,1024)
+ * Makefile.config: defined BMAKE_PATH_MAX to bmake_path_max
+ * make.h: use BMAKE_PATH_MAX if MAXPATHLEN not defined (needed for
+ Hurd)
+ * configure.in: Add AC_PREREQ and check for
+ sysctl; patch from Andrew Shadura andrewsh at debian.org
+
+2013-10-16 Simon J. Gerraty
+
+ * Makefile (MAKE_VERSION): 20131010
+ * lose the const from arg to systcl to avoid problems on older BSDs.
+
+2013-10-01 Simon J. Gerraty
+
+ * Makefile (MAKE_VERSION): 20131001
+ Merge with NetBSD make, pick up
+ o main.c: for NATIVE build sysctl to get MACHINE_ARCH from
+ hw.machine_arch if necessary.
+ o meta.c: meta_oodate - need to look at src of Link and target
+ of Move as well.
+ * main.c: check that CTL_HW and HW_MACHINE_ARCH exist.
+ provide __arraycount() if needed.
+
2013-09-04 Simon J. Gerraty
* Makefile (MAKE_VERSION): 20130904
Modified: head/contrib/bmake/Makefile
==
--- head/contrib/bmake/Makefile Mon Jan 27 17:31:21 2014(r261211)
+++ head/contrib/bmake/Makefile Mon Jan 27 17:47:21 2014(r261212)
@@ -1,7 +1,7 @@
-# $Id: Makefile,v 1.20 2013/09/04 15:42:03 sjg Exp $
+# $Id: Makefile,v 1.23 2014/01/02 22:20:52 sjg Exp $
# Base version on src date
-MAKE_VERSION= 20130904
+MAKE_VERSION= 20140101
PROG= bmake
@@ -68,7 +68,7 @@ SRCS+= ${LIBOBJS:T:.o=.c}
prefix?= /usr
srcdir?= ${.CURDIR}
-DEFAULT_SYS_PATH?= .../share/mk:${prefix}/share/mk
+DEFAULT_SYS_PATH?= ${prefix}/share/mk
CPPFLAGS+= -DUSE_META
CFLAGS+= ${CPPFLAGS}
Modified: head/contrib/bmake/Makefile.config.in
==
--- head/contrib/bmake/Makefile.config.in Mon Jan 27 17:31:21 2014
(r261211)
+++ head/contrib/bmake/Makefile.config.in Mon Jan 27 17:47:21 2014
(r261212)
@@ -14,3 +14,7 @@ LIBOBJS= @LIBOBJS@
LDADD= @LIBS@
USE_META= @use_meta@
FILEMON_H= @filemon_h@
+BMAKE_PATH_MAX?= @bmake_path_max@
+# used if MAXPATHLEN not defined
+CPPFLAGS+= -DBMAKE_PATH_MAX=${BMAKE_PATH_MAX}
+
Modified: head/contrib/bmake/bmake.1
==
--- head/contrib/bmake/bmake.1 Mon Jan 27 17:31:21 2014(r261211)
+++ head/contrib/bmake/bmake.1 Mon Jan 27 17:47:21 2014(r261212)
@@ -1,4 +1,4 @@
-.\"$NetBSD: make.1,v 1.222 2013/08/11 09:53:49 apb Exp $
+.\"$NetBSD: make.1,v 1.226 2013/11/07 18:50:46 dholland Exp $
.\"
.\" Copyright (c) 1990, 1993
.\"The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\"from: @(#)make.18.4 (Berkeley) 3/19/94
.\"
-.Dd August 11, 2013
+.Dd October 25, 2013
.Dt MAKE 1
.Os
.Sh NAME
@@ -745,7 +745,7 @@ then output for each target is prefixed
.Ql --- target ---
the first part of which can be controlled via
.Va .MAKE.JOB.PREFIX .
-If
+If
.Va .MAKE.JOB.PREFIX
is empty, no token is printed.
.br
@@ -1066,6 +1066,13 @@ may
be used.
The wildcard characters may be escaped with a backslash
.Pq Ql \e .
+As a consequence of the way values are split into words, matched,
+and then joine
svn commit: r250164 - head/contrib/bmake
Author: sjg
Date: Wed May 1 23:58:39 2013
New Revision: 250164
URL: http://svnweb.freebsd.org/changeset/base/250164
Log:
Local hack to allow smooth transition for ports.
bsd.port.mk can set .MAKE.FreeBSD_UL=yes
to cause :L and :U to have their old behavior.
This should be reverted when 8.3 is EOL.
PR: 173299
Reviewed by: obrien
Modified:
head/contrib/bmake/var.c
Modified: head/contrib/bmake/var.c
==
--- head/contrib/bmake/var.cWed May 1 23:04:29 2013(r250163)
+++ head/contrib/bmake/var.cWed May 1 23:58:39 2013(r250164)
@@ -140,6 +140,17 @@ __RCSID("$NetBSD: var.c,v 1.173 2013/02/
#include"job.h"
/*
+ * XXX transition hack for FreeBSD ports.
+ * bsd.port.mk can set .MAKE.FreeBSD_UL=yes
+ * to cause us to treat :[LU] as aliases for :t[lu]
+ * To be reverted when ports converts to :t[lu] (when 8.3 is EOL)
+ */
+#define MAKE_FREEBSD_UL ".MAKE.FreeBSD_UL"
+#ifdef MAKE_FREEBSD_UL
+static int FreeBSD_UL = FALSE;
+#endif
+
+/*
* This lets us tell if we have replaced the original environ
* (which we cannot free).
*/
@@ -965,6 +976,11 @@ Var_Set(const char *name, const char *va
setenv(MAKE_LEVEL_SAFE, tmp, 1);
#endif
}
+#ifdef MAKE_FREEBSD_UL
+if (strcmp(MAKE_FREEBSD_UL, name) == 0) {
+ FreeBSD_UL = getBoolean(MAKE_FREEBSD_UL, FALSE);
+}
+#endif
out:
@@ -2660,8 +2676,24 @@ ApplyModifiers(char *nstr, const char *t
free(loop.str);
break;
}
- case 'D':
case 'U':
+#ifdef MAKE_FREEBSD_UL
+ if (FreeBSD_UL) {
+ int nc = tstr[1];
+
+ /* we have to be careful, since :U is used internally */
+ if (nc == ':' || nc == endc) {
+ char *dp = bmake_strdup(nstr);
+ for (newStr = dp; *dp; dp++)
+ *dp = toupper((unsigned char)*dp);
+ cp = tstr + 1;
+ termc = *cp;
+ break; /* yes inside the conditional */
+ }
+ /* FALLTHROUGH */
+ }
+#endif
+ case 'D':
{
Buffer buf;/* Buffer for patterns */
int wantit; /* want data in buffer */
@@ -2721,6 +2753,17 @@ ApplyModifiers(char *nstr, const char *t
break;
}
case 'L':
+#ifdef MAKE_FREEBSD_UL
+ if (FreeBSD_UL) {
+ char *dp = bmake_strdup(nstr);
+ for (newStr = dp; *dp; dp++)
+ *dp = tolower((unsigned char)*dp);
+ cp = tstr + 1;
+ termc = *cp;
+ break;
+ }
+ /* FALLTHROUGH */
+#endif
{
if ((v->flags & VAR_JUNK) != 0)
v->flags |= VAR_KEEP;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r250699 - in head: share/mk usr.bin/make
Author: sjg
Date: Thu May 16 15:28:38 2013
New Revision: 250699
URL: http://svnweb.freebsd.org/changeset/base/250699
Log:
Build bmake by default.
If someone explicitly builds usr.bin/make while MK_BMAKE==yes,
install it as 'fmake'.
Reviewed by: brooks
Modified:
head/share/mk/bsd.own.mk
head/usr.bin/make/Makefile
Modified: head/share/mk/bsd.own.mk
==
--- head/share/mk/bsd.own.mkThu May 16 14:38:12 2013(r250698)
+++ head/share/mk/bsd.own.mkThu May 16 15:28:38 2013(r250699)
@@ -251,6 +251,7 @@ __DEFAULT_YES_OPTIONS = \
BIND_UTILS \
BINUTILS \
BLUETOOTH \
+BMAKE \
BOOT \
BSD_CPIO \
BSNMP \
@@ -360,7 +361,6 @@ __DEFAULT_NO_OPTIONS = \
BIND_LIBS \
BIND_SIGCHASE \
BIND_XML \
-BMAKE \
BSDCONFIG \
BSD_GREP \
CLANG_EXTRAS \
Modified: head/usr.bin/make/Makefile
==
--- head/usr.bin/make/Makefile Thu May 16 14:38:12 2013(r250698)
+++ head/usr.bin/make/Makefile Thu May 16 15:28:38 2013(r250699)
@@ -111,4 +111,11 @@ CFLAGS+= -DDEFSHELLNAME=\"${MAKE_SHELL}\
.error "MAKE_SHELL must be set to one of \"csh\", \"sh\" or \"ksh\"."
.endif
+.if ${MK_BMAKE} != "no"
+# if we are here we don't want this called 'make'
+PROG= fmake
+fmake.1: make.1
+ cp ${.ALLSRC} ${.TARGET}
+.endif
+
.include
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r250719 - in head: . usr.bin/make
Author: sjg
Date: Thu May 16 21:26:46 2013
New Revision: 250719
URL: http://svnweb.freebsd.org/changeset/base/250719
Log:
Reverse the sense of the test wrt bmake, and guard against
MK_BMAKE not being defined.
Modified:
head/Makefile
head/usr.bin/make/Makefile
Modified: head/Makefile
==
--- head/Makefile Thu May 16 21:04:56 2013(r250718)
+++ head/Makefile Thu May 16 21:26:46 2013(r250719)
@@ -281,7 +281,7 @@ kernel: buildkernel installkernel
#
upgrade_checks:
.if !defined(.PARSEDIR)
-.if defined(WITH_BMAKE)
+.if !defined(WITHOUT_BMAKE)
(cd ${.CURDIR} && ${MAKE} bmake)
.else
@if ! (cd ${.CURDIR}/tools/build/make_check && \
Modified: head/usr.bin/make/Makefile
==
--- head/usr.bin/make/Makefile Thu May 16 21:04:56 2013(r250718)
+++ head/usr.bin/make/Makefile Thu May 16 21:26:46 2013(r250719)
@@ -111,7 +111,7 @@ CFLAGS+=-DDEFSHELLNAME=\"${MAKE_SHELL}\
.error "MAKE_SHELL must be set to one of \"csh\", \"sh\" or \"ksh\"."
.endif
-.if ${MK_BMAKE} != "no"
+.if defined(MK_BMAKE) && ${MK_BMAKE} != "no"
# if we are here we don't want this called 'make'
PROG= fmake
fmake.1: make.1
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r250750 - in head: contrib/bmake usr.bin/bmake
Author: sjg
Date: Fri May 17 19:37:16 2013
New Revision: 250750
URL: http://svnweb.freebsd.org/changeset/base/250750
Log:
We really need to get the bsd.own.mk from this tree so the
correct options are set.
Also defined NO_PWD_OVERRIDE to match behavior of fmake.
Modified:
head/contrib/bmake/main.c
head/usr.bin/bmake/Makefile.inc
Modified: head/contrib/bmake/main.c
==
--- head/contrib/bmake/main.c Fri May 17 19:13:31 2013(r250749)
+++ head/contrib/bmake/main.c Fri May 17 19:37:16 2013(r250750)
@@ -796,7 +796,10 @@ main(int argc, char **argv)
Lst targs; /* target nodes to create -- passed to Make_Init */
Boolean outOfDate = FALSE; /* FALSE if all targets up to date */
struct stat sb, sa;
- char *p1, *path, *pwd;
+ char *p1, *path;
+#ifndef NO_PWD_OVERRIDE
+ char *pwd;
+#endif
char mdpath[MAXPATHLEN];
#ifdef FORCE_MACHINE
const char *machine = FORCE_MACHINE;
Modified: head/usr.bin/bmake/Makefile.inc
==
--- head/usr.bin/bmake/Makefile.inc Fri May 17 19:13:31 2013
(r250749)
+++ head/usr.bin/bmake/Makefile.inc Fri May 17 19:37:16 2013
(r250750)
@@ -1,5 +1,12 @@
# $FreeBSD$
+# we need the up to date bsd.own.mk
+.if ${.CURDIR:M*make} == ""
+.sinclude "share/mk/bsd.own.mk"
+.else
+.sinclude "../../share/mk/bsd.own.mk"
+.endif
+# the above should have found it...
.include "bsd.own.mk"
.if defined(.PARSEDIR)
@@ -16,3 +23,4 @@ NO_SHARED?= YES
.endif
WARNS=3
+CFLAGS+= -DNO_PWD_OVERRIDE
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r250699 - in head: share/mk usr.bin/make
>For me /usr/src is a symlink to /some/path and now if I build from >/usr/src some parts end up in /usr/obj/usr/src and other parts >in /usr/obj/some/path. It used to be the latter. This could be the result of some bits being built by the old freebsd make. Since the early stage of buildworld doesn't use the up to date bsd.own.mk I suspect that the install of bmake as $MAKEOBJDIRPREFIX$.CURDIR/make.$MACHINE/make may not be working. Ok, I just checked - it isn't, it gets installed there as bmake, which would explain the havior you see. Should be fixed now. Also bmake will now ignore PWD always - same as fmake. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r250755 - head/usr.bin/bmake
Author: sjg
Date: Fri May 17 22:18:27 2013
New Revision: 250755
URL: http://svnweb.freebsd.org/changeset/base/250755
Log:
Per the comment, we cannot rely on bsd.own.mk
we could be on an old system that knows noting of MK_BMAKE
or on an almost up to date one that is defaulting it to "no"
neither of which will work.
Modified:
head/usr.bin/bmake/Makefile.inc
Modified: head/usr.bin/bmake/Makefile.inc
==
--- head/usr.bin/bmake/Makefile.inc Fri May 17 21:45:52 2013
(r250754)
+++ head/usr.bin/bmake/Makefile.inc Fri May 17 22:18:27 2013
(r250755)
@@ -1,12 +1,5 @@
# $FreeBSD$
-# we need the up to date bsd.own.mk
-.if ${.CURDIR:M*make} == ""
-.sinclude "share/mk/bsd.own.mk"
-.else
-.sinclude "../../share/mk/bsd.own.mk"
-.endif
-# the above should have found it...
.include "bsd.own.mk"
.if defined(.PARSEDIR)
@@ -14,6 +7,12 @@
.export SRCTOP
.endif
+# Sadly, we cannot assume bsd.own.mk did its job,
+# nor can we safely include the one we want
+.if !defined(WITHOUT_BMAKE)
+MK_BMAKE= yes
+.endif
+
.if defined(MK_BMAKE) && ${MK_BMAKE} != "no"
PROG= make
.endif
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r250699 - in head: share/mk usr.bin/make
On Fri, 17 May 2013 23:34:08 +0200, Tijl Coosemans writes:
>When the output of /usr/local/libexec/portconf is empty make
>warns about it:
Yes. This is to avoid accidents.
If you *know* that no output is a valid result, you can add '; echo' to
the end of the command to suppress the warning.
>
>make: "/etc/make.conf" line 115: warning: Couldn't read shell's output fo=
>r
>"/usr/local/libexec/portconf"
>
>When it isn't empty, make fails on ${i:S/%/ /g} (evaluates to
Interesting will ponder that.
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r250770 - head/contrib/bmake
Author: sjg
Date: Sat May 18 13:07:01 2013
New Revision: 250770
URL: http://svnweb.freebsd.org/changeset/base/250770
Log:
Var_Delete: expand name to delete if needed.
Modified:
head/contrib/bmake/var.c
Modified: head/contrib/bmake/var.c
==
--- head/contrib/bmake/var.cSat May 18 12:54:37 2013(r250769)
+++ head/contrib/bmake/var.cSat May 18 13:07:01 2013(r250770)
@@ -540,11 +540,20 @@ void
Var_Delete(const char *name, GNode *ctxt)
{
Hash_Entry *ln;
-
-ln = Hash_FindEntry(&ctxt->context, name);
+char *cp;
+
+if (strchr(name, '$')) {
+ cp = Var_Subst(NULL, name, VAR_GLOBAL, 0);
+} else {
+ cp = name;
+}
+ln = Hash_FindEntry(&ctxt->context, cp);
if (DEBUG(VAR)) {
fprintf(debug_file, "%s:delete %s%s\n",
- ctxt->name, name, ln ? "" : " (not found)");
+ ctxt->name, cp, ln ? "" : " (not found)");
+}
+if (cp != name) {
+ free(cp);
}
if (ln != NULL) {
Var *v;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r250771 - head/contrib/bmake
Author: sjg
Date: Sat May 18 13:15:19 2013
New Revision: 250771
URL: http://svnweb.freebsd.org/changeset/base/250771
Log:
Match what is in netbsd.
Modified:
head/contrib/bmake/var.c
Modified: head/contrib/bmake/var.c
==
--- head/contrib/bmake/var.cSat May 18 13:07:01 2013(r250770)
+++ head/contrib/bmake/var.cSat May 18 13:15:19 2013(r250771)
@@ -545,7 +545,7 @@ Var_Delete(const char *name, GNode *ctxt
if (strchr(name, '$')) {
cp = Var_Subst(NULL, name, VAR_GLOBAL, 0);
} else {
- cp = name;
+ cp = (char *)name;
}
ln = Hash_FindEntry(&ctxt->context, cp);
if (DEBUG(VAR)) {
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r250773 - head/contrib/bmake
Author: sjg
Date: Sat May 18 13:24:53 2013
New Revision: 250773
URL: http://svnweb.freebsd.org/changeset/base/250773
Log:
Fix wildcard srcs for phony targets
Modified:
head/contrib/bmake/suff.c
Modified: head/contrib/bmake/suff.c
==
--- head/contrib/bmake/suff.c Sat May 18 13:19:31 2013(r250772)
+++ head/contrib/bmake/suff.c Sat May 18 13:24:53 2013(r250773)
@@ -2058,6 +2058,10 @@ SuffFindNormalDeps(GNode *gn, Lst slst)
* children, then look for any overriding transformations they imply.
* Should we find one, we discard the one we found before.
*/
+bottom = NULL;
+targ = NULL;
+
+if (!(gn->type & OP_PHONY)) {
while (ln != NULL) {
/*
@@ -2171,6 +2175,7 @@ SuffFindNormalDeps(GNode *gn, Lst slst)
for (targ = bottom; targ->parent != NULL; targ = targ->parent)
continue;
}
+}
Var_Set(TARGET, gn->path ? gn->path : gn->name, gn, 0);
@@ -2419,12 +2424,7 @@ SuffFindDeps(GNode *gn, Lst slst)
*/
Var_Set(TARGET, gn->path ? gn->path : gn->name, gn, 0);
Var_Set(PREFIX, gn->name, gn, 0);
-if (gn->type & OP_PHONY) {
- /*
-* If this is a .PHONY target, we do not apply suffix rules.
-*/
- return;
-}
+
if (DEBUG(SUFF)) {
fprintf(debug_file, "SuffFindDeps (%s)\n", gn->name);
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r250699 - in head: share/mk usr.bin/make
On Fri, 17 May 2013 23:34:08 +0200, Tijl Coosemans writes:
>_PORTCONF!=3D/usr/local/libexec/portconf
>=2Efor i in ${_PORTCONF:S/|/ /g}
>${i:S/%/ /g}
Is it possible to re-write this to be less dependent on how .for is
parsed?
Eg. assuming i is foo=[%]blah%goo
${i:C,=.*,,g} = ${i:C,.*=%*,,:S,%, ,g}
works the same for fmake and bmake.
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r250811 - vendor/NetBSD/bmake
Author: sjg
Date: Sun May 19 16:45:17 2013
New Revision: 250811
URL: http://svnweb.freebsd.org/changeset/base/250811
Log:
Automate import dance
Modified:
vendor/NetBSD/bmake/do-update.sh
Modified: vendor/NetBSD/bmake/do-update.sh
==
--- vendor/NetBSD/bmake/do-update.shSun May 19 16:25:09 2013
(r250810)
+++ vendor/NetBSD/bmake/do-update.shSun May 19 16:45:17 2013
(r250811)
@@ -8,7 +8,6 @@ ECHO=
SVN=${SVN:-/usr/local/bin/svn}
SITE=${SITE:-ftp://ftp.netbsd.org/pub/NetBSD/misc/sjg}
-
# For consistency...
Error() {
echo ERROR: ${1+"$@"} >&2
@@ -56,51 +55,31 @@ option_parsing() {
return $(($_shift - $#))
}
-# Call this function after all argument parsing has been done.
-sanity_checks() {
-# Do we have a working Subversion client?
-${SVN} --version -q >/dev/null || \
- Error "Cannot find a working subversion client."
-
-# Verify that a PR number and reviewer(s) were specified on the
-# command line.
-[ "$VERSION" ] || Error "We will a version \"number\" (can be a string).
Use VERSION=."
-# Need one (and only one) of ${url} or ${TARBALL} set.
-[ "${url:-$TARBALL}" -a "${url:-$TARBALL}" != "${TARBALL:-$url}" ] &&
Error "Please set either \"url\" or \"TARBALL\" (not both) in your import
script."
-[ -d dist ] || Error "The directory dist/ does not exist."
-}
-
###
option_parsing "$@"
shift $?
-sanity_checks
-fetch $SITE/bmake-${VERSION}.tar.gz.sha1
-fetch $SITE/bmake-${VERSION}.tar.gz
+Cd `dirname $0`
+test -s ${TARBALL:-/dev/null} || Error need TARBALL
+rm -rf bmake
+TF=/tmp/.$USER.$$
-HAVE=`sha1 bmake-${VERSION}.tar.gz`
-WANT=`cat bmake-${VERSION}.tar.gz.sha1`
-if [ x"$HAVE" != x"$WANT" ]; then
- Error "Fetched distfile does not have the expected SHA1 hash."
-fi
-
-tar xf bmake-${VERSION}.tar.gz
+tar zxf $TARBALL
+MAKE_VERSION=`grep '^MAKE_VERSION' bmake/Makefile | sed 's,.*=[[:space:]]*,,'`
rm -rf bmake/missing
-
-svn-vendorimport.sh bmake dist
-${SVN} stat dist
-
-rm -f bmake-${VERSION}.tar.gz bmake-${VERSION}.tar.gz.sha1
-
-echo "Import the ${VERSION} release of the \"Portable\" BSD make tool (from
NetBSD).
-
-Submitted by: Simon Gerraty " > /tmp/commit-log
-
-${ECHO} ${SVN} ci -F /tmp/commit-log dist
-
-SVNURL=$(${SVN} info | grep URL: | awk '{print $2}')
-
-${ECHO} ${SVN} copy \
--m "\"Tag\" the ${VERSION} Portable BSD make import." \
-${SVNURL}/dist ${SVNURL}/${VERSION}
+('cd' dist && $SVN list -R) | grep -v '/$' | sort > $TF.old
+('cd' bmake && find . -type f ) | cut -c 3- | sort > $TF.new
+comm -23 $TF.old $TF.new > $TF.rmlist
+comm -13 $TF.old $TF.new > $TF.addlist
+[ -s $TF.rmlist ] && { echo rm:; cat $TF.rmlist; }
+[ -s $TF.addlist ] && { echo add:; cat $TF.addlist; }
+('cd' bmake && tar cf - . | tar xf - -C ../dist)
+('cd' dist
+test -s $TF.rmlist && xargs $SVN rm < $TF.rmlist
+test -s $TF.addlist && xargs $SVN --parents add < $TF.addlist
+)
+
+url=`$SVN info | sed -n '/URL:/s,URL: ,,p'`
+echo After committing dist...
+echo $SVN cp $url/dist $url/$MAKE_VERSION
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r250835 - in vendor/NetBSD/bmake/dist: . mk
Author: sjg Date: Mon May 20 22:35:32 2013 New Revision: 250835 URL: http://svnweb.freebsd.org/changeset/base/250835 Log: Import bmake-20130520 to keep us in sync. Added: vendor/NetBSD/bmake/dist/mk/stage-install.sh (contents, props changed) Modified: vendor/NetBSD/bmake/dist/ChangeLog vendor/NetBSD/bmake/dist/FILES vendor/NetBSD/bmake/dist/Makefile vendor/NetBSD/bmake/dist/meta.c vendor/NetBSD/bmake/dist/mk/ChangeLog vendor/NetBSD/bmake/dist/mk/FILES vendor/NetBSD/bmake/dist/mk/gendirdeps.mk vendor/NetBSD/bmake/dist/mk/install-mk vendor/NetBSD/bmake/dist/mk/meta.stage.mk vendor/NetBSD/bmake/dist/mk/meta2deps.py vendor/NetBSD/bmake/dist/mk/meta2deps.sh vendor/NetBSD/bmake/dist/mk/options.mk vendor/NetBSD/bmake/dist/mk/progs.mk vendor/NetBSD/bmake/dist/suff.c vendor/NetBSD/bmake/dist/var.c Modified: vendor/NetBSD/bmake/dist/ChangeLog == --- vendor/NetBSD/bmake/dist/ChangeLog Mon May 20 22:18:18 2013 (r250834) +++ vendor/NetBSD/bmake/dist/ChangeLog Mon May 20 22:35:32 2013 (r250835) @@ -1,3 +1,17 @@ +2013-05-20 Simon J. Gerraty + + * Makefile (MAKE_VERSION): 20130520 + generate manifest from component FILES rather than have to + update FILES when mk/FILES changes. + +2013-05-18 Simon J. Gerraty + + * Makefile (MAKE_VERSION): 20130518 + Merge with NetBSD make, pick up + o suff.c: don't skip all processsing for .PHONY targets + else wildcard srcs do not get expanded. + o var.c: expand name of variable to delete if necessary. + 2013-03-30 Simon J. Gerraty * Makefile (MAKE_VERSION): 20130330 Modified: vendor/NetBSD/bmake/dist/FILES == --- vendor/NetBSD/bmake/dist/FILES Mon May 20 22:18:18 2013 (r250834) +++ vendor/NetBSD/bmake/dist/FILES Mon May 20 22:35:32 2013 (r250835) @@ -1,29 +1,26 @@ -FILES ChangeLog -bmake.cat1 -boot-strap -bsd.after-import.mk -os.sh -makefile.in +FILES Makefile Makefile.config.in PSD.doc/Makefile PSD.doc/tutorial.ms README +aclocal.m4 arch.c +bmake.1 +bmake.cat1 +boot-strap +bsd.after-import.mk buf.c buf.h compat.c cond.c -make-conf.h -make_malloc.c -make_malloc.h config.h.in configure -aclocal.m4 configure.in dir.c dir.h +dirname.c find_lib.sh for.c getopt.c @@ -32,16 +29,6 @@ hash.h install-sh job.c job.h -meta.c -meta.h -dirname.c -realpath.c -strlcpy.c -strlist.c -strlist.h -stresep.c -trace.c -trace.h lst.h lst.lib/Makefile lst.lib/lstAppend.c @@ -74,26 +61,36 @@ lst.lib/lstReplace.c lst.lib/lstSucc.c machine.sh main.c +make-bootstrap.sh.in +make-conf.h make.1 -bmake.1 make.c make.h -make-bootstrap.sh.in +make_malloc.c +make_malloc.h +makefile.in +meta.c +meta.h missing/sys/cdefs.h mkdeps.sh nonints.h +os.sh parse.c pathnames.h ranlib.h +realpath.c setenv.c sigcompat.c sprite.h str.c +stresep.c +strlcpy.c +strlist.c +strlist.h suff.c targ.c -util.c -var.c -wait.h +trace.c +trace.h unit-tests/Makefile.in unit-tests/comment unit-tests/cond1 @@ -123,63 +120,6 @@ unit-tests/test.exp unit-tests/unexport unit-tests/unexport-env unit-tests/varcmd -mk/ChangeLog -mk/FILES -mk/README -mk/auto.obj.mk -mk/autoconf.mk -mk/autodep.mk -mk/auto.dep.mk -mk/dep.mk -mk/doc.mk -mk/dpadd.mk -mk/final.mk -mk/host-target.mk -mk/host.libnames.mk -mk/inc.mk -mk/init.mk -mk/install-mk -mk/java.mk -mk/lib.mk -mk/libnames.mk -mk/libs.mk -mk/links.mk -mk/man.mk -mk/mk-files.txt -mk/nls.mk -mk/obj.mk -mk/options.mk -mk/own.mk -mk/prlist.mk -mk/prog.mk -mk/progs.mk -mk/rst2htm.mk -mk/scripts.mk -mk/srctop.mk -mk/subdir.mk -mk/sys.mk -mk/sys.clean-env.mk -mk/sys.dependfile.mk -mk/sys/AIX.mk -mk/sys/Darwin.mk -mk/sys/Generic.mk -mk/sys/HP-UX.mk -mk/sys/IRIX.mk -mk/sys/Linux.mk -mk/sys/NetBSD.mk -mk/sys/OSF1.mk -mk/sys/OpenBSD.mk -mk/sys/SunOS.mk -mk/sys/UnixWare.mk -mk/target-flags.mk -mk/warnings.mk -mk/yacc.mk -mk/dirdeps.mk -mk/gendirdeps.mk -mk/install-new.mk -mk/meta2deps.py -mk/meta2deps.sh -mk/meta.sys.mk -mk/meta.autodep.mk -mk/meta.stage.mk -mk/meta.subdir.mk +util.c +var.c +wait.h Modified: vendor/NetBSD/bmake/dist/Makefile == --- vendor/NetBSD/bmake/dist/Makefile Mon May 20 22:18:18 2013 (r250834) +++ vendor/NetBSD/bmake/dist/Makefile Mon May 20 22:35:32 2013 (r250835) @@ -1,7 +1,7 @@ -# $Id: Makefile,v 1.10 2013/03/31 05:57:19 sjg Exp $ +# $Id: Makefile,v 1.12 2013/05/20 16:05:10 sjg Exp $ # Base version on src date -MAKE_VERSION= 20130330 +MAKE_VERSION= 20130520 PROG= bmake Modified: vendor/NetBSD/bmake/dist/meta.c == --- vendor/NetBSD/bmake/dist/meta.c Mon May 20 22:18:18 2013 (r250834) +++ vendor/NetBSD/bmake/dist/meta.c Mon May
svn commit: r250836 - vendor/NetBSD/bmake/20130520
Author: sjg Date: Mon May 20 22:37:10 2013 New Revision: 250836 URL: http://svnweb.freebsd.org/changeset/base/250836 Log: Tag bmake-20130520 Added: vendor/NetBSD/bmake/20130520/ - copied from r250835, vendor/NetBSD/bmake/dist/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r250837 - in head: contrib/bmake contrib/bmake/mk usr.bin/bmake
Author: sjg Date: Mon May 20 22:51:11 2013 New Revision: 250837 URL: http://svnweb.freebsd.org/changeset/base/250837 Log: Sync with upstream version (20130520) that includes same fixes made last week. Added: head/contrib/bmake/mk/stage-install.sh - copied unchanged from r250836, vendor/NetBSD/bmake/dist/mk/stage-install.sh Modified: head/contrib/bmake/ChangeLog head/contrib/bmake/FILES head/contrib/bmake/Makefile head/contrib/bmake/meta.c head/contrib/bmake/mk/ChangeLog head/contrib/bmake/mk/FILES head/contrib/bmake/mk/gendirdeps.mk head/contrib/bmake/mk/install-mk head/contrib/bmake/mk/meta.stage.mk head/contrib/bmake/mk/meta2deps.py head/contrib/bmake/mk/meta2deps.sh head/contrib/bmake/mk/options.mk head/contrib/bmake/mk/progs.mk head/contrib/bmake/suff.c head/contrib/bmake/var.c head/usr.bin/bmake/Makefile Directory Properties: head/contrib/bmake/ (props changed) Modified: head/contrib/bmake/ChangeLog == --- head/contrib/bmake/ChangeLogMon May 20 22:37:10 2013 (r250836) +++ head/contrib/bmake/ChangeLogMon May 20 22:51:11 2013 (r250837) @@ -1,3 +1,17 @@ +2013-05-20 Simon J. Gerraty + + * Makefile (MAKE_VERSION): 20130520 + generate manifest from component FILES rather than have to + update FILES when mk/FILES changes. + +2013-05-18 Simon J. Gerraty + + * Makefile (MAKE_VERSION): 20130518 + Merge with NetBSD make, pick up + o suff.c: don't skip all processsing for .PHONY targets + else wildcard srcs do not get expanded. + o var.c: expand name of variable to delete if necessary. + 2013-03-30 Simon J. Gerraty * Makefile (MAKE_VERSION): 20130330 Modified: head/contrib/bmake/FILES == --- head/contrib/bmake/FILESMon May 20 22:37:10 2013(r250836) +++ head/contrib/bmake/FILESMon May 20 22:51:11 2013(r250837) @@ -1,29 +1,26 @@ -FILES ChangeLog -bmake.cat1 -boot-strap -bsd.after-import.mk -os.sh -makefile.in +FILES Makefile Makefile.config.in PSD.doc/Makefile PSD.doc/tutorial.ms README +aclocal.m4 arch.c +bmake.1 +bmake.cat1 +boot-strap +bsd.after-import.mk buf.c buf.h compat.c cond.c -make-conf.h -make_malloc.c -make_malloc.h config.h.in configure -aclocal.m4 configure.in dir.c dir.h +dirname.c find_lib.sh for.c getopt.c @@ -32,16 +29,6 @@ hash.h install-sh job.c job.h -meta.c -meta.h -dirname.c -realpath.c -strlcpy.c -strlist.c -strlist.h -stresep.c -trace.c -trace.h lst.h lst.lib/Makefile lst.lib/lstAppend.c @@ -74,26 +61,36 @@ lst.lib/lstReplace.c lst.lib/lstSucc.c machine.sh main.c +make-bootstrap.sh.in +make-conf.h make.1 -bmake.1 make.c make.h -make-bootstrap.sh.in +make_malloc.c +make_malloc.h +makefile.in +meta.c +meta.h missing/sys/cdefs.h mkdeps.sh nonints.h +os.sh parse.c pathnames.h ranlib.h +realpath.c setenv.c sigcompat.c sprite.h str.c +stresep.c +strlcpy.c +strlist.c +strlist.h suff.c targ.c -util.c -var.c -wait.h +trace.c +trace.h unit-tests/Makefile.in unit-tests/comment unit-tests/cond1 @@ -123,63 +120,6 @@ unit-tests/test.exp unit-tests/unexport unit-tests/unexport-env unit-tests/varcmd -mk/ChangeLog -mk/FILES -mk/README -mk/auto.obj.mk -mk/autoconf.mk -mk/autodep.mk -mk/auto.dep.mk -mk/dep.mk -mk/doc.mk -mk/dpadd.mk -mk/final.mk -mk/host-target.mk -mk/host.libnames.mk -mk/inc.mk -mk/init.mk -mk/install-mk -mk/java.mk -mk/lib.mk -mk/libnames.mk -mk/libs.mk -mk/links.mk -mk/man.mk -mk/mk-files.txt -mk/nls.mk -mk/obj.mk -mk/options.mk -mk/own.mk -mk/prlist.mk -mk/prog.mk -mk/progs.mk -mk/rst2htm.mk -mk/scripts.mk -mk/srctop.mk -mk/subdir.mk -mk/sys.mk -mk/sys.clean-env.mk -mk/sys.dependfile.mk -mk/sys/AIX.mk -mk/sys/Darwin.mk -mk/sys/Generic.mk -mk/sys/HP-UX.mk -mk/sys/IRIX.mk -mk/sys/Linux.mk -mk/sys/NetBSD.mk -mk/sys/OSF1.mk -mk/sys/OpenBSD.mk -mk/sys/SunOS.mk -mk/sys/UnixWare.mk -mk/target-flags.mk -mk/warnings.mk -mk/yacc.mk -mk/dirdeps.mk -mk/gendirdeps.mk -mk/install-new.mk -mk/meta2deps.py -mk/meta2deps.sh -mk/meta.sys.mk -mk/meta.autodep.mk -mk/meta.stage.mk -mk/meta.subdir.mk +util.c +var.c +wait.h Modified: head/contrib/bmake/Makefile == --- head/contrib/bmake/Makefile Mon May 20 22:37:10 2013(r250836) +++ head/contrib/bmake/Makefile Mon May 20 22:51:11 2013(r250837) @@ -1,7 +1,7 @@ -# $Id: Makefile,v 1.10 2013/03/31 05:57:19 sjg Exp $ +# $Id: Makefile,v 1.12 2013/05/20 16:05:10 sjg Exp $ # Base version on src date -MAKE_VERSION= 20130330 +MAKE_VERSION= 20130520 PROG= bmake Modified: head/contrib/bmake/meta.c == --- head/contrib/bmake/meta.c Mon May 20 22:37:10 2013(r250836) +++ head/contrib/bmake/m
svn commit: r250867 - head
Author: sjg Date: Tue May 21 18:38:09 2013 New Revision: 250867 URL: http://svnweb.freebsd.org/changeset/base/250867 Log: Mention the switch to bmake by default. Reviewed by: obrien Modified: head/UPDATING Modified: head/UPDATING == --- head/UPDATING Tue May 21 18:13:57 2013(r250866) +++ head/UPDATING Tue May 21 18:38:09 2013(r250867) @@ -31,6 +31,18 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20130516: + Use bmake by default. + Whereas before one could choose to build with bmake via + -DWITH_BMAKE one must now use -DWITHOUT_BMAKE to use the old + make. The goal is to remove these knobs for 10-RELEASE. + + It is worth noting that bmake (like gmake) treats the command + line as the unit of failure, rather than statements within the + command line. Thus '(cd some/where && dosomething)' is safer + than 'cd some/where; dosomething'. The '()' allows consistent + behavior in parallel build. + 20130429: Fix a bug that allows NFS clients to issue READDIR on files. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r251352 - head
Author: sjg
Date: Mon Jun 3 23:51:46 2013
New Revision: 251352
URL: http://svnweb.freebsd.org/changeset/base/251352
Log:
bmake does not like universe_${target}_prologue in the .ORDER
when there is an explicit dependency for it anyway.
Remove it so both bmake and fmake do the same thing.
Reviewed by: OBrien
Modified:
head/Makefile
Modified: head/Makefile
==
--- head/Makefile Mon Jun 3 22:22:53 2013(r251351)
+++ head/Makefile Mon Jun 3 23:51:46 2013(r251352)
@@ -375,7 +375,7 @@ universe_prologue:
.endif
.for target in ${TARGETS}
universe: universe_${target}
-.ORDER: universe_prologue upgrade_checks universe_${target}_prologue
universe_${target} universe_epilogue
+.ORDER: universe_prologue upgrade_checks universe_${target} universe_epilogue
universe_${target}: universe_${target}_prologue
universe_${target}_prologue:
@echo ">> ${target} started on `LC_ALL=C date`"
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r251420 - vendor/NetBSD/bmake/dist
Author: sjg
Date: Wed Jun 5 15:51:46 2013
New Revision: 251420
URL: http://svnweb.freebsd.org/changeset/base/251420
Log:
Import bmake-20130604
Modified:
vendor/NetBSD/bmake/dist/ChangeLog
vendor/NetBSD/bmake/dist/Makefile
vendor/NetBSD/bmake/dist/job.c
vendor/NetBSD/bmake/dist/make.1
vendor/NetBSD/bmake/dist/var.c
Modified: vendor/NetBSD/bmake/dist/ChangeLog
==
--- vendor/NetBSD/bmake/dist/ChangeLog Wed Jun 5 13:03:47 2013
(r251419)
+++ vendor/NetBSD/bmake/dist/ChangeLog Wed Jun 5 15:51:46 2013
(r251420)
@@ -1,3 +1,16 @@
+2013-06-04 Simon J. Gerraty
+
+ * Makefile (MAKE_VERSION): 20130604
+ Merge with NetBSD make, pick up
+ o job.c: JobCreatePipe: do fcntl() after any tweaking of fd's
+ to avoid leaking descriptors.
+
+2013-05-28 Simon J. Gerraty
+
+ * Makefile (MAKE_VERSION): 20130528
+ Merge with NetBSD make, pick up
+ o var.c: cleanup some left-overs in VarHash()
+
2013-05-20 Simon J. Gerraty
* Makefile (MAKE_VERSION): 20130520
Modified: vendor/NetBSD/bmake/dist/Makefile
==
--- vendor/NetBSD/bmake/dist/Makefile Wed Jun 5 13:03:47 2013
(r251419)
+++ vendor/NetBSD/bmake/dist/Makefile Wed Jun 5 15:51:46 2013
(r251420)
@@ -1,7 +1,7 @@
-# $Id: Makefile,v 1.12 2013/05/20 16:05:10 sjg Exp $
+# $Id: Makefile,v 1.14 2013/06/05 04:03:22 sjg Exp $
# Base version on src date
-MAKE_VERSION= 20130520
+MAKE_VERSION= 20130604
PROG= bmake
Modified: vendor/NetBSD/bmake/dist/job.c
==
--- vendor/NetBSD/bmake/dist/job.c Wed Jun 5 13:03:47 2013
(r251419)
+++ vendor/NetBSD/bmake/dist/job.c Wed Jun 5 15:51:46 2013
(r251420)
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.172 2013/03/05 22:01:43 christos Exp $ */
+/* $NetBSD: job.c,v 1.173 2013/06/05 03:59:43 sjg Exp $*/
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: job.c,v 1.172 2013/03/05 22:01:43 christos Exp
$";
+static char rcsid[] = "$NetBSD: job.c,v 1.173 2013/06/05 03:59:43 sjg Exp $";
#else
#include
#ifndef lint
#if 0
static char sccsid[] = "@(#)job.c 8.2 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: job.c,v 1.172 2013/03/05 22:01:43 christos Exp $");
+__RCSID("$NetBSD: job.c,v 1.173 2013/06/05 03:59:43 sjg Exp $");
#endif
#endif /* not lint */
#endif
@@ -414,6 +414,15 @@ JobCreatePipe(Job *job, int minfd)
if (pipe(job->jobPipe) == -1)
Punt("Cannot create pipe: %s", strerror(errno));
+for (i = 0; i < 2; i++) {
+ /* Avoid using low numbered fds */
+ fd = fcntl(job->jobPipe[i], F_DUPFD, minfd);
+ if (fd != -1) {
+ close(job->jobPipe[i]);
+ job->jobPipe[i] = fd;
+ }
+}
+
/* Set close-on-exec flag for both */
(void)fcntl(job->jobPipe[0], F_SETFD, 1);
(void)fcntl(job->jobPipe[1], F_SETFD, 1);
@@ -426,15 +435,6 @@ JobCreatePipe(Job *job, int minfd)
*/
fcntl(job->jobPipe[0], F_SETFL,
fcntl(job->jobPipe[0], F_GETFL, 0) | O_NONBLOCK);
-
-for (i = 0; i < 2; i++) {
- /* Avoid using low numbered fds */
- fd = fcntl(job->jobPipe[i], F_DUPFD, minfd);
- if (fd != -1) {
- close(job->jobPipe[i]);
- job->jobPipe[i] = fd;
- }
-}
}
/*-
@@ -2828,6 +2828,8 @@ Job_ServerStart(int max_tokens, int jp_0
/* Pipe passed in from parent */
tokenWaitJob.inPipe = jp_0;
tokenWaitJob.outPipe = jp_1;
+ (void)fcntl(jp_0, F_SETFD, 1);
+ (void)fcntl(jp_1, F_SETFD, 1);
return;
}
Modified: vendor/NetBSD/bmake/dist/make.1
==
--- vendor/NetBSD/bmake/dist/make.1 Wed Jun 5 13:03:47 2013
(r251419)
+++ vendor/NetBSD/bmake/dist/make.1 Wed Jun 5 15:51:46 2013
(r251420)
@@ -1,4 +1,4 @@
-.\"$NetBSD: make.1,v 1.213 2013/03/31 05:49:51 sjg Exp $
+.\"$NetBSD: make.1,v 1.215 2013/05/22 19:35:11 christos Exp $
.\"
.\" Copyright (c) 1990, 1993
.\"The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\"from: @(#)make.18.4 (Berkeley) 3/19/94
.\"
-.Dd March 30, 2013
+.Dd May 22, 2013
.Dt MAKE 1
.Os
.Sh NAME
@@ -2110,6 +2110,13 @@ for Sprite at Berkeley.
It was designed to be a parallel distributed make running jobs on different
machines using a daemon called
.Dq customs .
+.Pp
+Historically the target/dependency
+.Dq FRC
+has been used to FoRCe rebuilding (si
svn commit: r251421 - vendor/NetBSD/bmake/20130604
Author: sjg Date: Wed Jun 5 15:52:24 2013 New Revision: 251421 URL: http://svnweb.freebsd.org/changeset/base/251421 Log: Tag bmake-20130604 Added: vendor/NetBSD/bmake/20130604/ - copied from r251420, vendor/NetBSD/bmake/dist/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r251422 - in head: contrib/bmake usr.bin/bmake
Author: sjg
Date: Wed Jun 5 16:12:50 2013
New Revision: 251422
URL: http://svnweb.freebsd.org/changeset/base/251422
Log:
Update to bmake-20130604 to fix file descriptor leak.
Modified:
head/contrib/bmake/ChangeLog
head/contrib/bmake/Makefile
head/contrib/bmake/job.c
head/contrib/bmake/make.1
head/contrib/bmake/var.c
head/usr.bin/bmake/Makefile
Directory Properties:
head/contrib/bmake/ (props changed)
Modified: head/contrib/bmake/ChangeLog
==
--- head/contrib/bmake/ChangeLogWed Jun 5 15:52:24 2013
(r251421)
+++ head/contrib/bmake/ChangeLogWed Jun 5 16:12:50 2013
(r251422)
@@ -1,3 +1,16 @@
+2013-06-04 Simon J. Gerraty
+
+ * Makefile (MAKE_VERSION): 20130604
+ Merge with NetBSD make, pick up
+ o job.c: JobCreatePipe: do fcntl() after any tweaking of fd's
+ to avoid leaking descriptors.
+
+2013-05-28 Simon J. Gerraty
+
+ * Makefile (MAKE_VERSION): 20130528
+ Merge with NetBSD make, pick up
+ o var.c: cleanup some left-overs in VarHash()
+
2013-05-20 Simon J. Gerraty
* Makefile (MAKE_VERSION): 20130520
Modified: head/contrib/bmake/Makefile
==
--- head/contrib/bmake/Makefile Wed Jun 5 15:52:24 2013(r251421)
+++ head/contrib/bmake/Makefile Wed Jun 5 16:12:50 2013(r251422)
@@ -1,7 +1,7 @@
-# $Id: Makefile,v 1.12 2013/05/20 16:05:10 sjg Exp $
+# $Id: Makefile,v 1.14 2013/06/05 04:03:22 sjg Exp $
# Base version on src date
-MAKE_VERSION= 20130520
+MAKE_VERSION= 20130604
PROG= bmake
Modified: head/contrib/bmake/job.c
==
--- head/contrib/bmake/job.cWed Jun 5 15:52:24 2013(r251421)
+++ head/contrib/bmake/job.cWed Jun 5 16:12:50 2013(r251422)
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.172 2013/03/05 22:01:43 christos Exp $ */
+/* $NetBSD: job.c,v 1.173 2013/06/05 03:59:43 sjg Exp $*/
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: job.c,v 1.172 2013/03/05 22:01:43 christos Exp
$";
+static char rcsid[] = "$NetBSD: job.c,v 1.173 2013/06/05 03:59:43 sjg Exp $";
#else
#include
#ifndef lint
#if 0
static char sccsid[] = "@(#)job.c 8.2 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: job.c,v 1.172 2013/03/05 22:01:43 christos Exp $");
+__RCSID("$NetBSD: job.c,v 1.173 2013/06/05 03:59:43 sjg Exp $");
#endif
#endif /* not lint */
#endif
@@ -414,6 +414,15 @@ JobCreatePipe(Job *job, int minfd)
if (pipe(job->jobPipe) == -1)
Punt("Cannot create pipe: %s", strerror(errno));
+for (i = 0; i < 2; i++) {
+ /* Avoid using low numbered fds */
+ fd = fcntl(job->jobPipe[i], F_DUPFD, minfd);
+ if (fd != -1) {
+ close(job->jobPipe[i]);
+ job->jobPipe[i] = fd;
+ }
+}
+
/* Set close-on-exec flag for both */
(void)fcntl(job->jobPipe[0], F_SETFD, 1);
(void)fcntl(job->jobPipe[1], F_SETFD, 1);
@@ -426,15 +435,6 @@ JobCreatePipe(Job *job, int minfd)
*/
fcntl(job->jobPipe[0], F_SETFL,
fcntl(job->jobPipe[0], F_GETFL, 0) | O_NONBLOCK);
-
-for (i = 0; i < 2; i++) {
- /* Avoid using low numbered fds */
- fd = fcntl(job->jobPipe[i], F_DUPFD, minfd);
- if (fd != -1) {
- close(job->jobPipe[i]);
- job->jobPipe[i] = fd;
- }
-}
}
/*-
@@ -2828,6 +2828,8 @@ Job_ServerStart(int max_tokens, int jp_0
/* Pipe passed in from parent */
tokenWaitJob.inPipe = jp_0;
tokenWaitJob.outPipe = jp_1;
+ (void)fcntl(jp_0, F_SETFD, 1);
+ (void)fcntl(jp_1, F_SETFD, 1);
return;
}
Modified: head/contrib/bmake/make.1
==
--- head/contrib/bmake/make.1 Wed Jun 5 15:52:24 2013(r251421)
+++ head/contrib/bmake/make.1 Wed Jun 5 16:12:50 2013(r251422)
@@ -1,4 +1,4 @@
-.\"$NetBSD: make.1,v 1.213 2013/03/31 05:49:51 sjg Exp $
+.\"$NetBSD: make.1,v 1.215 2013/05/22 19:35:11 christos Exp $
.\"
.\" Copyright (c) 1990, 1993
.\"The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\"from: @(#)make.18.4 (Berkeley) 3/19/94
.\"
-.Dd March 30, 2013
+.Dd May 22, 2013
.Dt MAKE 1
.Os
.Sh NAME
@@ -2110,6 +2110,13 @@ for Sprite at Berkeley.
It was designed to be a parallel distributed make running jobs on different
machines using a daemon called
.Dq customs .
+.Pp
+Historically the target/dependency
+.Dq FRC
+has been used to FoRCe re
svn commit: r251506 - head/share/mk
Author: sjg Date: Fri Jun 7 19:45:04 2013 New Revision: 251506 URL: http://svnweb.freebsd.org/changeset/base/251506 Log: Override bmake's default MAKEFILE_PREFERENCE Modified: head/share/mk/sys.mk Modified: head/share/mk/sys.mk == --- head/share/mk/sys.mkFri Jun 7 19:42:00 2013(r251505) +++ head/share/mk/sys.mkFri Jun 7 19:45:04 2013(r251506) @@ -334,7 +334,7 @@ OBJFORMAT?= elf .MAKE.EXPAND_VARIABLES= yes # Tell bmake the makefile preference -.MAKE.MAKEFILE_PREFERENCE?= BSDmakefile makefile Makefile +.MAKE.MAKEFILE_PREFERENCE= BSDmakefile makefile Makefile .if !defined(.PARSEDIR) # We are not bmake, which is more aggressive about searching .PATH ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r251693 - head
Author: sjg
Date: Thu Jun 13 18:39:17 2013
New Revision: 251693
URL: http://svnweb.freebsd.org/changeset/base/251693
Log:
Explain remedy for -J error from old make
Modified:
head/UPDATING
Modified: head/UPDATING
==
--- head/UPDATING Thu Jun 13 18:33:54 2013(r251692)
+++ head/UPDATING Thu Jun 13 18:39:17 2013(r251693)
@@ -31,6 +31,23 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
disable the most expensive debugging functionality run
"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+20130613:
+ Some people report the following error after the switch to bmake:
+
+ make: illegal option -- J
+ usage: make [-BPSXeiknpqrstv] [-C directory] [-D variable]
+ ...
+ *** [buildworld] Error code 2
+
+ this likely due to an old instance of make in
+ ${MAKEPATH} (${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE})
+ which src/Makefile will use that blindly, if it exists, so if
+ you see the above error:
+
+ rm -rf `make -V MAKEPATH`
+
+ should resolve it.
+
20130516:
Use bmake by default.
Whereas before one could choose to build with bmake via
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r251748 - head/share/mk
Author: sjg
Date: Fri Jun 14 16:24:07 2013
New Revision: 251748
URL: http://svnweb.freebsd.org/changeset/base/251748
Log:
We cannot remove the _+_ trick, until old make is completely deprecated.
But we don't want to set it to + for bmake since it breaks make -N
which is used to supress the normal handling of targets marked with .MAKE
(which seems broken in fmake and might be why _+_ was introduced).
Add some comments to explain what's gong on.
Reviewed by: obrien
Modified:
head/share/mk/sys.mk
Modified: head/share/mk/sys.mk
==
--- head/share/mk/sys.mkFri Jun 14 15:58:24 2013(r251747)
+++ head/share/mk/sys.mkFri Jun 14 16:24:07 2013(r251748)
@@ -95,7 +95,13 @@ ECHODIR ?= true
.endif
.endif
-.if !empty(.MAKEFLAGS:M-n) && ${.MAKEFLAGS:M-n} == "-n"
+.if defined(.PARSEDIR)
+# _+_ appears to be a workaround for the special src .MAKE not working.
+# setting it to + interferes with -N
+_+_?=
+.elif !empty(.MAKEFLAGS:M-n) && ${.MAKEFLAGS:M-n} == "-n"
+# the check above matches only a single -n, so -n -n will result
+# in _+_ = +
_+_?=
.else
_+_?= +
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r251749 - head/share/mk
Author: sjg
Date: Fri Jun 14 16:25:41 2013
New Revision: 251749
URL: http://svnweb.freebsd.org/changeset/base/251749
Log:
Flag recursive make targets with .MAKE (has no effect on fmake)
make -n will still exectute such targets
make -N will not.
Reviewed by: obrien
Modified:
head/share/mk/bsd.subdir.mk
Modified: head/share/mk/bsd.subdir.mk
==
--- head/share/mk/bsd.subdir.mk Fri Jun 14 16:24:07 2013(r251748)
+++ head/share/mk/bsd.subdir.mk Fri Jun 14 16:25:41 2013(r251749)
@@ -36,14 +36,14 @@ :
DISTRIBUTION?= base
.if !target(distribute)
-distribute:
+distribute: .MAKE
.for dist in ${DISTRIBUTION}
${_+_}cd ${.CURDIR}; \
${MAKE} install -DNO_SUBDIR DESTDIR=${DISTDIR}/${dist} SHARED=copies
.endfor
.endif
-_SUBDIR: .USE
+_SUBDIR: .USE .MAKE
.if defined(SUBDIR) && !empty(SUBDIR) && !defined(NO_SUBDIR)
@${_+_}set -e; for entry in ${SUBDIR}; do \
if test -d ${.CURDIR}/$${entry}.${MACHINE_ARCH}; then \
@@ -60,7 +60,7 @@ _SUBDIR: .USE
done
.endif
-${SUBDIR}: .PHONY
+${SUBDIR}: .PHONY .MAKE
${_+_}@if test -d ${.TARGET}.${MACHINE_ARCH}; then \
cd ${.CURDIR}/${.TARGET}.${MACHINE_ARCH}; \
else \
@@ -81,7 +81,7 @@ ${__stage}${__target}:
${__stage}${__target}: _SUBDIR
.endif
.endfor
-${__target}:
+${__target}: .MAKE
${_+_}set -e; cd ${.CURDIR}; ${MAKE} build${__target}; ${MAKE}
install${__target}
.endfor
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r251750 - head
Author: sjg
Date: Fri Jun 14 16:30:11 2013
New Revision: 251750
URL: http://svnweb.freebsd.org/changeset/base/251750
Log:
Flag recursive make targets with .MAKE
so that job token pipe is passed to them.
To avoid surprising anyone, only add .MAKE to ${TGTS} when -n
has not been specified (at least for Makefile).
Reviewed by: obrien
Modified:
head/Makefile
head/Makefile.inc1
Modified: head/Makefile
==
--- head/Makefile Fri Jun 14 16:25:41 2013(r251749)
+++ head/Makefile Fri Jun 14 16:30:11 2013(r251750)
@@ -209,6 +209,12 @@ cleanworld:
# Handle the user-driven targets, using the source relative mk files.
#
+.if empty(.MAKEFLAGS:M-n)
+# skip this for -n to avoid changing previous behavior of
+# 'make -n buildworld' etc.
+${TGTS}: .MAKE
+.endif
+
${TGTS}:
${_+_}@cd ${.CURDIR}; ${_MAKE} ${.TARGET}
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Fri Jun 14 16:25:41 2013(r251749)
+++ head/Makefile.inc1 Fri Jun 14 16:30:11 2013(r251750)
@@ -1890,3 +1890,5 @@ _xi-links:
xdev xdev-build xdev-install:
@echo "*** Error: Both XDEV and XDEV_ARCH must be defined for
\"${.TARGET}\" target"
.endif
+
+buildkernel ${WMAKE_TGTS} ${.ALLTARGETS:M_*}: .MAKE
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r258095 - head/share/mk
Author: sjg
Date: Wed Nov 13 15:10:32 2013
New Revision: 258095
URL: http://svnweb.freebsd.org/changeset/base/258095
Log:
Allow this to work with fmake
Based on patch from Garret Cooper.
Modified:
head/share/mk/bsd.progs.mk
Modified: head/share/mk/bsd.progs.mk
==
--- head/share/mk/bsd.progs.mk Wed Nov 13 14:46:41 2013(r258094)
+++ head/share/mk/bsd.progs.mk Wed Nov 13 15:10:32 2013(r258095)
@@ -16,14 +16,20 @@
.MAIN: all
-.if defined(PROGS)
+.if defined(PROGS) || defined(PROGS_CXX)
+# we really only use PROGS below...
+PROGS += ${PROGS_CXX}
# In meta mode, we can capture dependenices for _one_ of the progs.
# if makefile doesn't nominate one, we use the first.
+.if defined(.PARSEDIR)
.ifndef UPDATE_DEPENDFILE_PROG
UPDATE_DEPENDFILE_PROG = ${PROGS:[1]}
.export UPDATE_DEPENDFILE_PROG
.endif
+.else
+UPDATE_DEPENDFILE_PROG?= no
+.endif
.ifndef PROG
# They may have asked us to build just one
@@ -40,11 +46,13 @@ PROG_VARS += BINDIR CFLAGS CPPFLAGS CXXF
.for v in ${PROG_VARS:O:u}
.if defined(${v}.${PROG})
$v += ${${v}_${PROG}:U${${v}.${PROG}}}
+.else
+$v ?=
.endif
.endfor
# for meta mode, there can be only one!
-.if ${PROG} == ${UPDATE_DEPENDFILE_PROG:Uno}
+.if ${PROG} == ${UPDATE_DEPENDFILE_PROG}
UPDATE_DEPENDFILE ?= yes
.endif
UPDATE_DEPENDFILE ?= NO
@@ -63,7 +71,7 @@ UPDATE_DEPENDFILE = NO
.endif
# handle being called [bsd.]progs.mk
-.include <${.PARSEFILE:S,progs,prog,}>
+.include
.ifndef PROG
# tell progs.mk we might want to install things
@@ -76,11 +84,11 @@ x.$p= PROG_CXX=$p
.endif
$p ${p}_p: .PHONY .MAKE
- (cd ${.CURDIR} && ${.MAKE} -f ${MAKEFILE} PROG=$p ${x.$p})
+ (cd ${.CURDIR} && ${MAKE} -f ${MAKEFILE} PROG=$p ${x.$p})
.for t in ${PROGS_TARGETS:O:u}
$p.$t: .PHONY .MAKE
- (cd ${.CURDIR} && ${.MAKE} -f ${MAKEFILE} PROG=$p ${x.$p} ${@:E})
+ (cd ${.CURDIR} && ${MAKE} -f ${MAKEFILE} PROG=$p ${x.$p} ${@:E})
.endfor
.endfor
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r258113 - head/contrib/bmake/lst.lib
Author: sjg
Date: Thu Nov 14 00:06:44 2013
New Revision: 258113
URL: http://svnweb.freebsd.org/changeset/base/258113
Log:
Avoid SEGV when passed NULL for list
Modified:
head/contrib/bmake/lst.lib/lstMember.c
Modified: head/contrib/bmake/lst.lib/lstMember.c
==
--- head/contrib/bmake/lst.lib/lstMember.c Thu Nov 14 00:02:18 2013
(r258112)
+++ head/contrib/bmake/lst.lib/lstMember.c Thu Nov 14 00:06:44 2013
(r258113)
@@ -58,6 +58,9 @@ Lst_Member(Lst l, void *d)
List list = l;
ListNode lNode;
+if (list == NULL) {
+ return NULL;
+}
lNode = list->firstPtr;
if (lNode == NULL) {
return NULL;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r258114 - head/contrib/bmake
Author: sjg
Date: Thu Nov 14 00:29:48 2013
New Revision: 258114
URL: http://svnweb.freebsd.org/changeset/base/258114
Log:
Don't SEGV when Hash_Table is uninitialized
Modified:
head/contrib/bmake/hash.c
Modified: head/contrib/bmake/hash.c
==
--- head/contrib/bmake/hash.c Thu Nov 14 00:06:44 2013(r258113)
+++ head/contrib/bmake/hash.c Thu Nov 14 00:29:48 2013(r258114)
@@ -221,6 +221,9 @@ Hash_FindEntry(Hash_Table *t, const char
unsigned h;
const char *p;
+ if (t == NULL || t->bucketPtr == NULL) {
+ return NULL;
+ }
for (h = 0, p = key; *p;)
h = (h << 5) - h + *p++;
p = key;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r258285 - in head/lib/atf: libatf-c++/tests libatf-c/tests tests/test-programs
On Sun, 17 Nov 2013 23:12:55 +, Julio Merino writes: > I am not sure how this ever worked before given that manual inspection > of bsd.progs.mk clearly shows that the expected character between the > two components is a dot and not an underscore... but I suspect the Actually . or _ worked, until recently. Will fix. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r258330 - head/share/mk
Author: sjg
Date: Tue Nov 19 00:34:59 2013
New Revision: 258330
URL: http://svnweb.freebsd.org/changeset/base/258330
Log:
Need to also test for defined(${v}_${PROG})
Modified:
head/share/mk/bsd.progs.mk
Modified: head/share/mk/bsd.progs.mk
==
--- head/share/mk/bsd.progs.mk Mon Nov 18 23:11:42 2013(r258329)
+++ head/share/mk/bsd.progs.mk Tue Nov 19 00:34:59 2013(r258330)
@@ -44,7 +44,7 @@ PROG ?= $t
# just one of many
PROG_VARS += BINDIR CFLAGS CPPFLAGS CXXFLAGS DPADD DPLIBS LDADD MAN SRCS
.for v in ${PROG_VARS:O:u}
-.if defined(${v}.${PROG})
+.if defined(${v}.${PROG}) || defined(${v}_${PROG})
$v += ${${v}_${PROG}:U${${v}.${PROG}}}
.else
$v ?=
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r258285 - in head/lib/atf: libatf-c++/tests libatf-c/tests tests/test-programs
On Thu, 21 Nov 2013 18:29:15 -0500, Julio Merino writes: >> Actually . or _ worked, until recently. > >I think only supporting one form is better in the name of simplicity. Generally I would agree. Originally I used '_' for this and a number of other things, but in many cases find that '.' makes for easier reading. >> Will fix. > >Garrett also mentioned to me that we should not be required to >explicitly set SRCS.*: when building various programs, each of them Being explicit doesn't hurt. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r254419 - head/contrib/bmake
On Tue, 24 Sep 2013 20:41:19 +0400, Sergey Kandaurov writes: >> +.Fx 9 > >This results in mdoc warning. >:mdoc warning: .Fx: Unknown FreeBSD version `9' (#733) On what release? Surely 9 and later know about 9? ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r254419 - head/contrib/bmake
On Tue, 24 Sep 2013 15:23:44 -0400, Benjamin Kaduk writes: >> There is no "FreeBSD 9,", only "FreeBSD 9.0", "FreeBSD 9.1", etc. Ah - sorry. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r255916 - head/contrib/bmake
Author: sjg Date: Fri Sep 27 17:42:23 2013 New Revision: 255916 URL: http://svnweb.freebsd.org/changeset/base/255916 Log: Fix Fx syntax. PR: 182269 Approved by: re@ Modified: head/contrib/bmake/make.1 Modified: head/contrib/bmake/make.1 == --- head/contrib/bmake/make.1 Fri Sep 27 16:02:40 2013(r255915) +++ head/contrib/bmake/make.1 Fri Sep 27 17:42:23 2013(r255916) @@ -730,7 +730,7 @@ even if the target is not tagged with The default is .Ql Pa yes for backwards compatability with -.Fx 9 +.Fx 9.0 and earlier. .It Va .MAKE.DEPENDFILE Names the makefile (default ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: this breaks builds of head on stable/9 (Re: svn commit: r257268 - head/gnu/usr.bin/binutils/ld
On Fri, 1 Nov 2013 17:15:32 -0500, Brooks Davis writes: >(In practice WITHOUT_BMAKE is broken and corrupts your object tree with a >make that fails until manually deleted.) That's new? it worked last time I checked - which was around the time I made sure the make thus built was named for the flavor (fmake or bmake) desired so wouldn't accidentally be used when you change your mind. >We should decide if it should be fixed or removed before 10 goes out. AFAIK I committed workarounds for all the functional differences that worried people, before 10 was branched. So perhaps WITHOUT_BMAKE can be deprecated. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: this breaks builds of head on stable/9 (Re: svn commit: r257268 - head/gnu/usr.bin/binutils/ld
>told me what was wrong. The issue is that the :U modifer I used is a >bmake feature and that the toolchain target doesn't bootstrap bmake (or >perhaps doesn't do it early enough). I plan to commit a workaround for Hmmm toolchain is in the same TGTS list as buildworld, so should depend on upgrade_checks which is how the needed make gets built. Oh, that only applies if ALWAYS_CHECK_MAKE is defined. Might be a good idea to set ALWAYS_CHECK_MAKE is host isn't head? ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r257773 - head/contrib/telnet/telnetd
Author: sjg
Date: Thu Nov 7 00:36:39 2013
New Revision: 257773
URL: http://svnweb.freebsd.org/changeset/base/257773
Log:
Propagate ancient fix from Junos.
Use of -h is not supposed to depend on AUTHENTICATION being defined.
Reviewed by: markm
Modified:
head/contrib/telnet/telnetd/sys_term.c
Modified: head/contrib/telnet/telnetd/sys_term.c
==
--- head/contrib/telnet/telnetd/sys_term.c Thu Nov 7 00:25:49 2013
(r257772)
+++ head/contrib/telnet/telnetd/sys_term.c Thu Nov 7 00:36:39 2013
(r257773)
@@ -1052,11 +1052,11 @@ start_login(char *host undef1, int autol
*/
if ((auth_level < 0) || (autologin != AUTH_VALID))
# endif
+#endif /* AUTHENTICATION */
{
argv = addarg(argv, "-h");
argv = addarg(argv, host);
}
-#endif /* AUTHENTICATION */
#endif
#if!defined(NO_LOGIN_P)
argv = addarg(argv, "-p");
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r243392 - head/share/mk
Author: sjg
Date: Thu Nov 22 04:50:42 2012
New Revision: 243392
URL: http://svnweb.freebsd.org/changeset/base/243392
Log:
INSTALL_AS_USER: output of id -un will never match 0 so use id -u
and USER for BINOWN etc.
Approved by: marcel (mentor)
Modified:
head/share/mk/bsd.own.mk
Modified: head/share/mk/bsd.own.mk
==
--- head/share/mk/bsd.own.mkThu Nov 22 04:17:32 2012(r243391)
+++ head/share/mk/bsd.own.mkThu Nov 22 04:50:42 2012(r243392)
@@ -678,11 +678,14 @@ CTFCONVERT_CMD= @:
.endif
.if ${MK_INSTALL_AS_USER} != "no"
-_uid!= id -un
+_uid!= id -u
.if ${_uid} != 0
+.if !defined(USER)
+USER!= id -un
+.endif
_gid!= id -gn
.for x in BIN CONF DOC INFO KMOD LIB MAN NLS SHARE
-$xOWN= ${_uid}
+$xOWN= ${USER}
$xGRP= ${_gid}
.endfor
.endif
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r243393 - head/share/mk
Author: sjg
Date: Thu Nov 22 04:53:09 2012
New Revision: 243393
URL: http://svnweb.freebsd.org/changeset/base/243393
Log:
If .PARSEDIR is defined we have bmake, and CTFCONVERT_CMD can be empty.
PR: 172440
Approved by: marcel (mentor)
Modified:
head/share/mk/bsd.own.mk
Modified: head/share/mk/bsd.own.mk
==
--- head/share/mk/bsd.own.mkThu Nov 22 04:50:42 2012(r243392)
+++ head/share/mk/bsd.own.mkThu Nov 22 04:53:09 2012(r243393)
@@ -671,7 +671,7 @@ MK_${var}:= no
.if ${MK_CTF} != "no"
CTFCONVERT_CMD=${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.elif defined(MAKE_VERSION) && ${MAKE_VERSION} >= 520300
+.elif defined(.PARSEDIR) || (defined(MAKE_VERSION) && ${MAKE_VERSION} >=
520300)
CTFCONVERT_CMD=
.else
CTFCONVERT_CMD=@:
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: Reviewing before commit and stability minibikeshed (Re: svn commit: r243627 - head/sys/kern)
>On 11/28/12 7:49 PM, Garrett Cooper wrote: >> I know it's sort of done in some groups [based on commit messages], but it w >ould be nice to have it better formalized and socialized as well. Things like Trying to get too formalized could be counter productive. >> An extension of this code review idea would probably be reviewboard. Email b >ased review is doable and a lot of OSS groups use it, but there are some nice >points to using a more advanced tool, in particular: >> 1. Colorized diffs. FWIW all the Colorized tools I've seen just hurt my eyes. On Wed, 28 Nov 2012 20:17:33 -0800, Alfred Perlstein writes: >I've seen what happens with large groups, it doesn't scale and basically >you wind up with the following type of reviewers: The issues you cite, are the result of taking a good idea too far. Mandating reviews for all changes - does not make sense, and all the ills you describe are natural consequences. But AFAIK that wasn't what Robert was talking about. Some bits of code do warrant extra care when touching. Unless you are the sole author and maintainer (and sometimes even then) getting a 2nd opinion (from someone familiar with the code) makes sense. That does not have to map to a requirement for formal reviewers, review tracking etc - none of which would scale in a volunteer organization anyway. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r243713 - head
Author: sjg
Date: Fri Nov 30 20:50:34 2012
New Revision: 243713
URL: http://svnweb.freebsd.org/changeset/base/243713
Log:
The build-tools step during build32 also needs the -legacy magic.
Approved by: marcel (mentor)
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Fri Nov 30 20:15:01 2012(r243712)
+++ head/Makefile.inc1 Fri Nov 30 20:50:34 2012(r243713)
@@ -511,6 +511,8 @@ build32:
.endfor
.for _dir in lib/ncurses/ncurses lib/ncurses/ncursesw lib/libmagic
cd ${.CURDIR}/${_dir}; \
+ WORLDTMP=${WORLDTMP} \
+ MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \
MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} SSP_CFLAGS= DESTDIR= \
DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF \
-DEARLY_BUILD build-tools
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r241298 - in head: . gnu/usr.bin/cc/cc_int gnu/usr.bin/cc/include kerberos5 kerberos5/tools/asn1_compile kerberos5/tools/slc lib/clang/include share/mk tools/build/make_check usr.sbin/
On Sat, 20 Oct 2012 21:13:36 +1100 (EST), Bruce Evans writes:
>Back to the old thread. Followup to the new commit thread.
I seem to have missed a bit of the conversation, so sorry if some of
this has been done to death already.
First some background:
I believe the reason for the original change (which was wrong btw,
I had stared at that diff many times and saw it as what I expected it to
be - which I think Marcel has now committed),
is that .ORDER does not work in jobs mode in the presence of explicit
dependencies (see below).
Since we auto collect dependencies during the build, we've learned to
avoid .ORDER, it is often responsible for introducing cycles in the
dependency graph.
Given the makefile:
8<
.MAIN: all
ALPHA=a b c d e f g h i j k l m n o p q r s t u v w x y z
SECS?=1
${ALPHA}:
@echo "`date +%s` $@..."; sleep ${SECS}
.NOPATH: ${ALPHA}
.PHONY: ${ALPHA}
ALL=r a l p h i s g i t
.ifdef ORDER
x!= echo .ORDER: r a l p h >&2; echo
.ORDER: r a l p h
.endif
all: ${ALL}
.ifdef DEPS_A
x!= echo a: p e >&2; echo
a: p e
.endif
8<
The following is using FreeBSD make from 10.x (though it doesn't make
any difference):
First compat mode:
$ fmake -r -f /home/sjg/make-tests/order
1350755164 r...
1350755165 a...
1350755166 l...
1350755168 p...
1350755169 h...
1350755170 i...
1350755171 s...
1350755172 g...
1350755173 t...
$
Looks as you would expect, as does jobs mode:
$ fmake -r -f /home/sjg/make-tests/order -j3
1350755240 r...
1350755240 l...
1350755240 a...
1350755241 p...
1350755241 h...
1350755241 i...
1350755242 s...
1350755242 g...
1350755242 t...
$
Ie. the order is no longer as listed, but we haven't introduce .ORDER yet.
When we throw .ORDER in:
$ fmake -r -f /home/sjg/make-tests/order -j3 -DORDER
.ORDER: r a l p h
1350755270 s...
1350755270 i...
1350755270 r...
1350755271 g...
1350755271 t...
1350755271 a...
1350755272 l...
1350755273 p...
1350755275 h...
$
This is again what we should expect, the order is not as listed but
the sequence r a l p h is correctly ordered.
However, as soon as we thrown in an explicit dependency - not even one
that would conflict:
$ fmake -r -f /home/sjg/make-tests/order -j3 -DORDER -DDEPS_A
.ORDER: r a l p h
a: p e
1350755349 r...
1350755350 i...
1350755350 s...
1350755351 g...
1350755351 t...
1350755351 e...
$
That is simply incorrect.
Even if we go back to compat mode:
$ fmake -r -f /home/sjg/make-tests/order -DORDER -DDEPS_A
.ORDER: r a l p h
a: p e
1350755881 r...
1350755882 p...
1350755883 e...
1350755884 a...
1350755885 l...
1350755887 h...
1350755888 i...
1350755889 s...
1350755890 g...
1350755891 t...
$
This is not correct either, but you can see that the dependency takes
precedence over .ORDER.
The results with bmake are more spectaclular since it detects that it is
lost a spews its complaints:
$ bmake -r -f /home/sjg/make-tests/order -DORDER -DDEPS_A -j3
.ORDER: r a l p h
a: p e
--- r ---
1350756420 r...
`p' was not built (made 1, flags 2009, type b030001)!
`p' has .ORDER dependency against l (made 0, flags 9, type b030001)
`e' was not built (made 0, flags 2009, type b030001)!
`l' was not built (made 0, flags 2009, type b030001)!
`l' has .ORDER dependency against a (made 1, flags 3019, type
b030001)
`h' was not built (made 0, flags 2009, type b030001)!
`h' has .ORDER dependency against p (made 1, flags 2009, type
b030001)
`i' was not built (made 0, flags 2009, type b030001)!
`s' was not built (made 0, flags 2009, type b030001)!
`g' was not built (made 0, flags 2009, type b030001)!
`t' was not built (made 0, flags 2009, type b030001)!
$
This is actually handy since you can check build logs for that sort of
thing and know you have an issue.
The current logic does (for the interesting case - assuming yacc -d etc)
parser.h: parser.y
yacc etc
parser.c: parser.h
touch ${.TARGET}
the only downside of this, is that if parser.c is removed
but parser.h is left alone, and empty parser.c will be produced.
This is actually a safe failure mode (build will fail), for what is
essentially a corner case.
In all other respects the above is preferable because it works reliably
in jobs mode and it avoids any risk of running yacc multiple times to do
the same thing, and will not conflict with any auto collected
dependencies (assuming parser.c includes parser.h)
--sjg
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r242000 - head/share/misc
Author: sjg Date: Wed Oct 24 14:06:47 2012 New Revision: 242000 URL: http://svn.freebsd.org/changeset/base/242000 Log: Add entry for sjg Approved by:marcel (mentor) Modified: head/share/misc/committers-src.dot Modified: head/share/misc/committers-src.dot == --- head/share/misc/committers-src.dot Wed Oct 24 12:49:03 2012 (r241999) +++ head/share/misc/committers-src.dot Wed Oct 24 14:06:47 2012 (r242000) @@ -247,6 +247,7 @@ scottl [label="Scott Long\nscottl@FreeBS sephe [label="Sepherosa Ziehau\nse...@freebsd.org\n2007/03/28"] sepotvin [label="Stephane E. Potvin\nsepot...@freebsd.org\n2007/02/15"] simon [label="Simon L. Nielsen\nsi...@freebsd.org\n2006/03/07"] +sjg [label="Simon J. Gerraty\n...@freebsd.org\n2012/10/23"] sobomax [label="Maxim Sobolev\nsobo...@freebsd.org\n2001/07/25"] sos [label="Soren Schmidt\n...@freebsd.org\n/??/??"] sson [label="Stacey Son\ns...@freebsd.org\n2008/07/08"] @@ -496,6 +497,7 @@ marcel -> art marcel -> arun marcel -> marius marcel -> nwhitehorn +marcel -> sjg markm -> jasone markm -> sheldonh ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r242093 - vendor/NetBSD/bmake/dist
Author: sjg
Date: Thu Oct 25 20:31:22 2012
New Revision: 242093
URL: http://svn.freebsd.org/changeset/base/242093
Log:
Import bmake-20121010
Relevant items from ChangeLog:
o [Makefile.in:] protect syntax that only bmake parses correctly.
o compat.c: ignore empty commands - same as jobs mode.
o make.1: document meta chars that cause use of shell
Approved by: marcelm (mentor)
Modified:
vendor/NetBSD/bmake/dist/ChangeLog
vendor/NetBSD/bmake/dist/Makefile.in
vendor/NetBSD/bmake/dist/bmake.1
vendor/NetBSD/bmake/dist/bmake.cat1
vendor/NetBSD/bmake/dist/bsd.after-import.mk
vendor/NetBSD/bmake/dist/compat.c
vendor/NetBSD/bmake/dist/make.1
Modified: vendor/NetBSD/bmake/dist/ChangeLog
==
--- vendor/NetBSD/bmake/dist/ChangeLog Thu Oct 25 20:23:04 2012
(r242092)
+++ vendor/NetBSD/bmake/dist/ChangeLog Thu Oct 25 20:31:22 2012
(r242093)
@@ -1,3 +1,27 @@
+2012-10-10 Simon J. Gerraty
+
+ * Makefile.in (MAKE_VERSION): 20121010
+ o protect syntax that only bmake parses correctly.
+ o remove auto setting of FORCE_MACHINE, use configure's
+ --with-force-machine=whatever if that is desired.
+
+2012-10-08 Simon J. Gerraty
+
+ * Makefile.in: do not lose history from make.1 when generating bmake.1
+
+2012-10-07 Simon J. Gerraty
+
+ * Makefile.in (MAKE_VERSION): 20121007
+ Merge with NetBSD make, pick up
+ o compat.c: ignore empty commands - same as jobs mode.
+ o make.1: document meta chars that cause use of shell
+
+2012-09-11 Simon J. Gerraty
+
+ * Makefile.in (MAKE_VERSION): bump version to 20120911
+ * bsd.after-import.mk: include Makefile.inc early and allow it to
+ override PROG
+
2012-08-31 Simon J. Gerraty
* Makefile.in (MAKE_VERSION): bump version to 20120831
Modified: vendor/NetBSD/bmake/dist/Makefile.in
==
--- vendor/NetBSD/bmake/dist/Makefile.inThu Oct 25 20:23:04 2012
(r242092)
+++ vendor/NetBSD/bmake/dist/Makefile.inThu Oct 25 20:31:22 2012
(r242093)
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.56 2012/05/30 21:54:23 sjg Exp $
# @(#)Makefile5.2 (Berkeley) 12/28/90
-# $Id: Makefile.in,v 1.170 2012/08/31 06:46:22 sjg Exp $
+# $Id: Makefile.in,v 1.174 2012/10/10 18:46:24 sjg Exp $
PROG= bmake
SRCS= arch.c buf.c compat.c cond.c dir.c for.c hash.c job.c main.c \
@@ -21,7 +21,7 @@ srcdir= @srcdir@
CC?= @CC@
# Base version on src date
-MAKE_VERSION= 20120831
+MAKE_VERSION= 20121010
MACHINE=@machine@
MACHINE_ARCH=@machine_arch@
DEFAULT_SYS_PATH = @default_sys_path@
@@ -71,10 +71,9 @@ SUBDIR= PSD.doc
.endif
.endif
+.if defined(.PARSEDIR)
+# we cannot rely on anything but bmake to parse this correctly.
.if empty(isBSD44:M${OS})
-# XXX not sure if we still want this given that configure
-# lets us force or not the definition of MACHINE.
-CFLAGS_main.o+= "-DFORCE_MACHINE=\"${MACHINE}\""
MANTARGET=cat
INSTALL?=${srcdir}/install-sh
.if (${MACHINE} == "sun386")
@@ -85,7 +84,7 @@ SRCS+= sigcompat.c
CFLAGS+= -DSIGNAL_FLAGS=SA_RESTART
.endif
.endif
-.if defined(.PARSEDIR)
+
.if make(obj) || make(clean)
SUBDIR+= unit-tests
.endif
@@ -104,14 +103,18 @@ EXTRACT_MAN=no
MAN=${PROG}.1
.if (${PROG} != "make")
-${MAN}:make.1
- @echo making ${PROG}.1
- @sed -e 's/^.Nx/NetBSD/' -e '/^.Nm/s/make/${PROG}/' -e '/^.Sh
HISTORY/,$$d' ${srcdir}/make.1 > $@
- @(echo ".Sh HISTORY"; \
- echo ".Nm"; \
+my.history: ${MAKEFILE}
+ @(echo ".Nm"; \
echo "is derived from NetBSD"; \
echo ".Xr make 1 ."; \
- echo It uses autoconf to facilitate portability to other platforms.) >>
$@
+ echo "It uses autoconf to facilitate portability to other platforms."; \
+ echo ".Pp") > $@
+
+${MAN}:make.1 my.history
+ @echo making ${PROG}.1
+ @sed -e 's/^.Nx/NetBSD/' -e '/^.Nm/s/make/${PROG}/' \
+ -e '/^.Sh HISTORY/rmy.history' \
+ -e '/^.Sh HISTORY/,$$s,^.Nm,make,' ${.CURDIR}/make.1 > $@
.endif
Modified: vendor/NetBSD/bmake/dist/bmake.1
==
--- vendor/NetBSD/bmake/dist/bmake.1Thu Oct 25 20:23:04 2012
(r242092)
+++ vendor/NetBSD/bmake/dist/bmake.1Thu Oct 25 20:31:22 2012
(r242093)
@@ -1,4 +1,4 @@
-.\"$NetBSD: make.1,v 1.206 2012/08/30 22:35:37 wiz Exp $
+.\"$NetBSD: make.1,v 1.209 2012/10/08 15:09:48 christos Exp $
.\"
.\" Copyright (c) 1990, 1993
.\"The Regents of the University of Californi
svn commit: r242094 - vendor/NetBSD/bmake/20121010
Author: sjg Date: Thu Oct 25 20:34:44 2012 New Revision: 242094 URL: http://svn.freebsd.org/changeset/base/242094 Log: Tag bmake/20121010 Approved by: marcel (mentor) Added: vendor/NetBSD/bmake/20121010/ - copied from r242093, vendor/NetBSD/bmake/dist/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r242102 - in head: contrib/bmake usr.bin/bmake
Author: sjg
Date: Thu Oct 25 23:18:05 2012
New Revision: 242102
URL: http://svn.freebsd.org/changeset/base/242102
Log:
Merge bmake-20121010
Approved by: marcel (mentor)
Modified:
head/contrib/bmake/ChangeLog
head/contrib/bmake/Makefile.in
head/contrib/bmake/bmake.1
head/contrib/bmake/bmake.cat1
head/contrib/bmake/bsd.after-import.mk
head/contrib/bmake/compat.c
head/contrib/bmake/make.1
head/usr.bin/bmake/Makefile
Directory Properties:
head/contrib/bmake/ (props changed)
Modified: head/contrib/bmake/ChangeLog
==
--- head/contrib/bmake/ChangeLogThu Oct 25 22:54:29 2012
(r242101)
+++ head/contrib/bmake/ChangeLogThu Oct 25 23:18:05 2012
(r242102)
@@ -1,3 +1,27 @@
+2012-10-10 Simon J. Gerraty
+
+ * Makefile.in (MAKE_VERSION): 20121010
+ o protect syntax that only bmake parses correctly.
+ o remove auto setting of FORCE_MACHINE, use configure's
+ --with-force-machine=whatever if that is desired.
+
+2012-10-08 Simon J. Gerraty
+
+ * Makefile.in: do not lose history from make.1 when generating bmake.1
+
+2012-10-07 Simon J. Gerraty
+
+ * Makefile.in (MAKE_VERSION): 20121007
+ Merge with NetBSD make, pick up
+ o compat.c: ignore empty commands - same as jobs mode.
+ o make.1: document meta chars that cause use of shell
+
+2012-09-11 Simon J. Gerraty
+
+ * Makefile.in (MAKE_VERSION): bump version to 20120911
+ * bsd.after-import.mk: include Makefile.inc early and allow it to
+ override PROG
+
2012-08-31 Simon J. Gerraty
* Makefile.in (MAKE_VERSION): bump version to 20120831
Modified: head/contrib/bmake/Makefile.in
==
--- head/contrib/bmake/Makefile.in Thu Oct 25 22:54:29 2012
(r242101)
+++ head/contrib/bmake/Makefile.in Thu Oct 25 23:18:05 2012
(r242102)
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.56 2012/05/30 21:54:23 sjg Exp $
# @(#)Makefile5.2 (Berkeley) 12/28/90
-# $Id: Makefile.in,v 1.170 2012/08/31 06:46:22 sjg Exp $
+# $Id: Makefile.in,v 1.174 2012/10/10 18:46:24 sjg Exp $
PROG= bmake
SRCS= arch.c buf.c compat.c cond.c dir.c for.c hash.c job.c main.c \
@@ -21,7 +21,7 @@ srcdir= @srcdir@
CC?= @CC@
# Base version on src date
-MAKE_VERSION= 20120831
+MAKE_VERSION= 20121010
MACHINE=@machine@
MACHINE_ARCH=@machine_arch@
DEFAULT_SYS_PATH = @default_sys_path@
@@ -71,10 +71,9 @@ SUBDIR= PSD.doc
.endif
.endif
+.if defined(.PARSEDIR)
+# we cannot rely on anything but bmake to parse this correctly.
.if empty(isBSD44:M${OS})
-# XXX not sure if we still want this given that configure
-# lets us force or not the definition of MACHINE.
-CFLAGS_main.o+= "-DFORCE_MACHINE=\"${MACHINE}\""
MANTARGET=cat
INSTALL?=${srcdir}/install-sh
.if (${MACHINE} == "sun386")
@@ -85,7 +84,7 @@ SRCS+= sigcompat.c
CFLAGS+= -DSIGNAL_FLAGS=SA_RESTART
.endif
.endif
-.if defined(.PARSEDIR)
+
.if make(obj) || make(clean)
SUBDIR+= unit-tests
.endif
@@ -104,14 +103,18 @@ EXTRACT_MAN=no
MAN=${PROG}.1
.if (${PROG} != "make")
-${MAN}:make.1
- @echo making ${PROG}.1
- @sed -e 's/^.Nx/NetBSD/' -e '/^.Nm/s/make/${PROG}/' -e '/^.Sh
HISTORY/,$$d' ${srcdir}/make.1 > $@
- @(echo ".Sh HISTORY"; \
- echo ".Nm"; \
+my.history: ${MAKEFILE}
+ @(echo ".Nm"; \
echo "is derived from NetBSD"; \
echo ".Xr make 1 ."; \
- echo It uses autoconf to facilitate portability to other platforms.) >>
$@
+ echo "It uses autoconf to facilitate portability to other platforms."; \
+ echo ".Pp") > $@
+
+${MAN}:make.1 my.history
+ @echo making ${PROG}.1
+ @sed -e 's/^.Nx/NetBSD/' -e '/^.Nm/s/make/${PROG}/' \
+ -e '/^.Sh HISTORY/rmy.history' \
+ -e '/^.Sh HISTORY/,$$s,^.Nm,make,' ${.CURDIR}/make.1 > $@
.endif
Modified: head/contrib/bmake/bmake.1
==
--- head/contrib/bmake/bmake.1 Thu Oct 25 22:54:29 2012(r242101)
+++ head/contrib/bmake/bmake.1 Thu Oct 25 23:18:05 2012(r242102)
@@ -1,4 +1,4 @@
-.\"$NetBSD: make.1,v 1.206 2012/08/30 22:35:37 wiz Exp $
+.\"$NetBSD: make.1,v 1.209 2012/10/08 15:09:48 christos Exp $
.\"
.\" Copyright (c) 1990, 1993
.\"The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\"from: @(#)make.18.4 (Berkeley) 3/19/94
.\"
-.Dd August 30, 2012
+.Dd October 8, 2012
.Dt MAKE 1
.Os
.Sh NAME
@@ -2042,6 +2042,13 @@ or
To be compatible with Makefil
svn commit: r242501 - head/usr.sbin/makefs
Author: sjg
Date: Sat Nov 3 00:10:30 2012
New Revision: 242501
URL: http://svn.freebsd.org/changeset/base/242501
Log:
If no contents keyword is specified, the default for files is
the named file.
Approved by: marcel (mentor)
Modified:
head/usr.sbin/makefs/mtree.c
Modified: head/usr.sbin/makefs/mtree.c
==
--- head/usr.sbin/makefs/mtree.cFri Nov 2 23:25:52 2012
(r242500)
+++ head/usr.sbin/makefs/mtree.cSat Nov 3 00:10:30 2012
(r242501)
@@ -135,6 +135,47 @@ mtree_warning(const char *fmt, ...)
fputc('\n', stderr);
}
+#ifndef MAKEFS_MAX_TREE_DEPTH
+# define MAKEFS_MAX_TREE_DEPTH (MAXPATHLEN/2)
+#endif
+
+/* construct path to node->name */
+static char *
+mtree_file_path(fsnode *node)
+{
+ fsnode *pnode;
+ struct sbuf *sb;
+ char *res, *rp[MAKEFS_MAX_TREE_DEPTH];
+ int depth;
+
+ depth = 0;
+ rp[depth] = node->name;
+ for (pnode = node->parent; pnode && depth < MAKEFS_MAX_TREE_DEPTH;
+pnode = pnode->parent) {
+ if (strcmp(pnode->name, ".") == 0)
+ break;
+ rp[++depth] = pnode->name;
+ }
+
+ sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND);
+ if (sb == NULL) {
+ errno = ENOMEM;
+ return (NULL);
+ }
+ while (depth > 0) {
+ sbuf_cat(sb, rp[depth--]);
+ sbuf_putc(sb, '/');
+ }
+ sbuf_cat(sb, rp[depth]);
+ sbuf_finish(sb);
+ res = strdup(sbuf_data(sb));
+ sbuf_delete(sb);
+ if (res == NULL)
+ errno = ENOMEM;
+ return res;
+
+}
+
/* mtree_resolve() sets errno to indicate why NULL was returned. */
static char *
mtree_resolve(const char *spec, int *istemp)
@@ -706,6 +747,12 @@ read_mtree_keywords(FILE *fp, fsnode *no
return (0);
}
type = S_IFREG;
+ } else if (node->type != 0) {
+ type = node->type;
+ if (type == S_IFREG) {
+ /* the named path is the default contents */
+ node->contents = mtree_file_path(node);
+ }
} else
type = (node->symlink != NULL) ? S_IFLNK : S_IFDIR;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r242710 - head/share/mk
Author: sjg
Date: Wed Nov 7 21:44:04 2012
New Revision: 242710
URL: http://svnweb.freebsd.org/changeset/base/242710
Log:
Latest progs.mk from crufty.net for ATF
Approved by: marcel (mentor)
Modified:
head/share/mk/bsd.progs.mk
Modified: head/share/mk/bsd.progs.mk
==
--- head/share/mk/bsd.progs.mk Wed Nov 7 21:25:32 2012(r242709)
+++ head/share/mk/bsd.progs.mk Wed Nov 7 21:44:04 2012(r242710)
@@ -1,350 +1,88 @@
-# from: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91
# $FreeBSD$
-
-.include
-
-.SUFFIXES: .out .o .c .cc .cpp .cxx .C .m .y .l .ln .s .S .asm
-
-.if ${MK_MAN} == "no"
-NO_MAN=
+# $Id: progs.mk,v 1.11 2012/11/06 17:18:54 sjg Exp $
+#
+# @(#) Copyright (c) 2006, Simon J. Gerraty
+#
+# This file is provided in the hope that it will
+# be of use. There is absolutely NO WARRANTY.
+# Permission to copy, redistribute or otherwise
+# use this file is hereby granted provided that
+# the above copyright notice and this notice are
+# left intact.
+#
+# Please send copies of changes and bug-fixes to:
+# s...@crufty.net
+#
+
+.MAIN: all
+
+.if defined(PROGS)
+
+# In meta mode, we can capture dependenices for _one_ of the progs.
+# if makefile doesn't nominate one, we use the first.
+.ifndef UPDATE_DEPENDFILE_PROG
+UPDATE_DEPENDFILE_PROG = ${PROGS:[1]}
+.export UPDATE_DEPENDFILE_PROG
+.endif
+
+.ifndef PROG
+# They may have asked us to build just one
+.for t in ${PROGS}
+.if make($t)
+PROG ?= $t
.endif
-
-# Legacy knobs
-.if defined(PROG) || defined(PROG_CXX)
-. if defined(PROG)
-PROGS= ${PROG}
-. endif
-. if defined(PROG_CXX)
-PROGS= ${PROG_CXX}
-PROGS_CXX= ${PROG_CXX}
-. endif
-# Loop once to keep pattern and avoid namespace pollution
-. for _P in ${PROGS}
-. if defined(INTERNALPROG)
-INTERNALPROG.${_P}=
-. endif
-. if !defined(NO_MAN)
-. if defined(MAN)
-MAN.${_P}= ${MAN}
-. else
-.for sect in 1 1aout 2 3 4 5 6 7 8 9
-. if defined(MAN${sect})
-MAN.${_P}= ${MAN${sect}}
-. endif
-.endfor
-. endif
-. endif # defined(NO_MAN)
-. if defined(NLSNAME) && !empty(NLSNAME)
-NLSNAME.${P}:= ${NLSNAME}
-. endif
-. if defined(OBJS)
-OBJS.${_P}:= ${OBJS}
-. endif
-. if defined(PRECIOUSPROG)
-PRECIOUSPROG.${_P}=
-. endif
-. if defined(PROGNAME)
-PROGNAME.${_P}=${PROGNAME}
-. endif
-. if defined(SRCS)
-SRCS.${_P}:= ${SRCS}
-. endif
-. endfor
-.else # !defined(PROG) && !defined(PROG_CXX)
-. if defined(PROGS_CXX) && !empty(PROGS_CXX)
-PROGS+=${PROGS_CXX}
-. endif
-.endif # defined(PROG) || defined(PROG_CXX)
-
-.if defined(PROGS_CXX) && !empty(PROGS_CXX)
-. for _P in ${PROGS_CXX}
-PROG_CXX.${_P}=
-. endfor
+.endfor
.endif
-# Avoid recursive variables
-.undef NLSNAME
-
-.if defined(COPTS)
-CFLAGS+=${COPTS}
-.endif
+.if defined(PROG)
+# just one of many
+PROG_VARS += CFLAGS CPPFLAGS CXXFLAGS DPADD DPLIBS LDADD MAN SRCS
+.for v in ${PROG_VARS:O:u}
+$v += ${${v}_${PROG}:U${${v}.${PROG}}}
+.endfor
-.if defined(DEBUG_FLAGS)
-. if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != ""
-CTFFLAGS+= -g
-. endif
-CFLAGS+=${DEBUG_FLAGS}
-CXXFLAGS+=${DEBUG_FLAGS}
+# for meta mode, there can be only one!
+.if ${PROG} == ${UPDATE_DEPENDFILE_PROG:Uno}
+UPDATE_DEPENDFILE ?= yes
.endif
+UPDATE_DEPENDFILE ?= NO
-STRIP?=-s
+# ensure that we don't clobber each other's dependencies
+DEPENDFILE?= .depend.${PROG}
+# prog.mk will do the rest
+.else
+all: ${PROGS}
-.if ${MK_ASSERT_DEBUG} == "no"
-CFLAGS+= -DNDEBUG
-NO_WERROR=
+# We cannot capture dependencies for meta mode here
+UPDATE_DEPENDFILE = NO
+# nor can we safely run in parallel.
+.NOTPARALLEL:
.endif
-
-.for _P in ${PROGS}
-
-BINDIR.${_P}?= ${BINDIR}
-BINGRP.${_P}?= ${BINGRP}
-BINMODE.${_P}?=${BINMODE}
-BINOWN.${_P}?= ${BINOWN}
-
-CFLAGS.${_P}+= ${CFLAGS}
-CXXFLAGS.${_P}+= ${CXXFLAGS}
-DPADD.${_P}+= ${DPADD}
-LDADD.${_P}+= ${LDADD}
-LDFLAGS.${_P}+=${LDFLAGS}
-
-INSTALLFLAGS.${_P}?= ${INSTALLFLAGS}
-
-. if defined(PRECIOUSPROG.${_P})
-. if !defined(NO_FSCHG) && !defined(NO_FSCHG.${_P})
-INSTALLFLAGS.${_P}+= -fschg
-. endif
-INSTALLFLAGS.${_P}+= -S
-. endif
-
-NO_SHARED.${_P}?= ${NO_SHARED}
-
-. if !defined(NLSDIR.${_P})
-NLSDIR.${_P}:= ${NLSDIR}
-. endif
-. undef NLSDIR
-
-. if !empty(NO_SHARED.${_P}) && ${NO_SHARED.${_P}:tl} != "no"
-LDFLAGS.${_P}+= -static
-. endif
-
-. if defined(SRCS.${_P})
-
-_SRCS:=${SRCS.${_P}}
-OBJS.${_P}+= ${_SRCS:N*.h:R:S/$/.o/g}
-
-. if target(beforelinking)
-${_P}: ${OBJS.${_P}} beforelinking
-. else
-${_P}: ${OBJS.${_P}}
-. endif
-. if defined(PROG_CXX.${_P})
- ${CXX} ${CXXFLAGS.${_P}} ${LDFLAGS.${_P}} -o ${.TARGET} ${OBJS.${_P}} \
- ${LDADD.${_P}}
-. else
- ${CC} ${CFLAGS.${_P}} ${LDFLAGS.${_P}} -o ${.TARGET} ${OBJS.${_P}} \
-
svn commit: r242711 - head/share/mk
Author: sjg
Date: Wed Nov 7 22:02:02 2012
New Revision: 242711
URL: http://svnweb.freebsd.org/changeset/base/242711
Log:
Enable ATF testing.
Submitted by: Garrett Cooper
Approved by: marcel (mentor)
Added:
head/share/mk/atf.test.mk (contents, props changed)
head/share/mk/bsd.test.mk (contents, props changed)
Modified:
head/share/mk/bsd.subdir.mk
Added: head/share/mk/atf.test.mk
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/share/mk/atf.test.mk Wed Nov 7 22:02:02 2012(r242711)
@@ -0,0 +1,148 @@
+# $NetBSD$
+# $FreeBSD$
+#
+
+.include
+
+ATF_TESTS:=
+
+.if make(*test)
+TESTSDIR?= .
+.endif
+
+.if defined(ATF_TESTS_SUBDIRS)
+# Only visit subdirs when building, etc because ATF does this it on its own.
+.if !make(atf-test)
+SUBDIR+= ${ATF_TESTS_SUBDIRS}
+.endif
+ATF_TESTS+= ${ATF_TESTS_SUBDIRS}
+
+.include
+.endif
+
+.if defined(TESTS_C)
+ATF_TESTS+= ${TESTS_C}
+.for _T in ${TESTS_C}
+SRCS.${_T}?= ${_T}.c
+DPADD.${_T}+= ${LIBATF_C}
+LDADD.${_T}+= -latf-c
+.endfor
+.endif
+
+.if defined(TESTS_CXX)
+ATF_TESTS+= ${TESTS_CXX}
+.for _T in ${TESTS_CXX}
+SRCS.${_T}?= ${_T}${CXX_SUFFIX:U.cc}
+DPADD.${_T}+= ${LIBATF_CXX} ${LIBATF_C}
+LDADD.${_T}+= -latf-c++ -latf-c
+.endfor
+.endif
+
+.if defined(TESTS_SH)
+ATF_TESTS+= ${TESTS_SH}
+.for _T in ${TESTS_SH}
+CLEANFILES+= ${_T} ${_T}.tmp
+TESTS_SH_SRC_${_T}?= ${_T}.sh
+${_T}: ${TESTS_SH_SRC_${_T}}
+ echo '#! /usr/bin/atf-sh' > ${.TARGET}.tmp
+ cat ${.ALLSRC} >> ${.TARGET}.tmp
+ chmod +x ${.TARGET}.tmp
+ mv ${.TARGET}.tmp ${.TARGET}
+.endfor
+.endif
+
+ATFFILE?= auto
+
+.if ${ATFFILE:tl} != "no"
+FILES+=Atffile
+FILESDIR_Atffile= ${TESTSDIR}
+
+.if ${ATFFILE:tl} == "auto"
+CLEANFILES+= Atffile Atffile.tmp
+
+Atffile: Makefile
+ @{ echo 'Content-Type: application/X-atf-atffile; version="1"'; \
+ echo; \
+ echo '# Automatically generated by atf-test.mk.'; \
+ echo; \
+ echo 'prop: test-suite = "'`uname -o`'"'; \
+ echo; \
+ for tp in ${ATF_TESTS}; do \
+ echo "tp: $${tp}"; \
+ done; } >Atffile.tmp
+ @mv Atffile.tmp Atffile
+.endif
+.endif
+
+# Generate support variables for atf-test.
+#
+# atf-test can only work for native builds, i.e. a build host of a particular
+# OS building a release for the same OS version and architecture. The target
+# runs ATF, which is on the build host, and the tests execute code built for
+# the target host.
+#
+# Due to the dependencies of the binaries built by the source tree and how they
+# are used by tests, it is highly possible for a execution of "make test" to
+# report bogus results unless the new binaries are put in place.
+
+# XXX (gcooper): Executing ATF from outside the source tree is improper; it
+# should be built as part of the OS toolchain build for the host OS and
+# executed from there.
+ATF_PATH+= ${DESTDIR}/bin ${DESTDIR}/sbin ${DESTDIR}/usr/bin
${DESTDIR}/usr/sbin
+TESTS_ENV+= PATH=${ATF_PATH:ts:}:${PATH}
+
+ATF_BUILD_CC?= ${DESTDIR}/usr/bin/cc
+ATF_BUILD_CPP?= ${DESTDIR}/usr/bin/cpp
+ATF_BUILD_CXX?= ${DESTDIR}/usr/bin/c++
+ATF_CONFDIR?= ${DESTDIR}/etc
+ATF_INCLUDEDIR?= ${DESTDIR}/usr/include
+ATF_LIBDIR?= ${DESTDIR}/usr/lib
+ATF_LIBEXECDIR?= ${DESTDIR}/usr/libexec
+ATF_PKGDATADIR?= ${DESTDIR}/usr/share/atf
+ATF_SHELL?= ${DESTDIR}/bin/sh
+LD_LIBRARY_PATH?= ${TESTS_LD_LIBRARY_PATH:tW:S/ /:/g}
+
+ATF_ENV_VARS= \
+ ATF_BUILD_CC \
+ ATF_BUILD_CPP \
+ ATF_BUILD_CXX \
+ ATF_CONFDIR \
+ ATF_INCLUDEDIR \
+ ATF_LIBDIR \
+ ATF_LIBEXECDIR \
+ ATF_PKGDATADIR \
+ ATF_SHELL \
+
+.for v in ${ATF_ENV_VARS}
+.if !empty($v)
+TESTS_ENV+= $v=${$v}
+.endif
+.endfor
+
+_TESTS_FIFO= ${.OBJDIR}/atf-run.fifo
+_TESTS_LOG= ${.OBJDIR}/atf-run.log
+CLEANFILES+= ${_TESTS_FIFO} ${_TESTS_LOG}
+
+ATF_BIN?= ${DESTDIR}/usr/bin
+ATF_REPORT?= ${ATF_BIN}/atf-report
+ATF_RUN?= ${ATF_BIN}/atf-run
+
+.PHONY: realtest
+realtest:
+.if defined(TESTSDIR)
+ @set -e; \
+ cd ${DESTDIR}${TESTSDIR}; \
+ rm -f ${_TESTS_FIFO}; \
+ mkfifo ${_TESTS_FIFO}; \
+ tee ${_TESTS_LOG} < ${_TESTS_FIFO} | ${TESTS_ENV} ${ATF_REPORT} & \
+ set +e; \
+ ${TESTS_ENV} ${ATF_RUN} >> ${_TESTS_FIFO}; \
+ result=$${?}; \
+ wait; \
+ rm -f ${_TESTS_FIFO}; \
+ echo; \
+ echo "*** The verbatim output of atf-run has been saved to
${_TESTS_LOG}"; \
+ exit $${result}
+.endif
+
+.include
Modified: head/share/mk/bsd.subdir.mk
==
--- head/share/mk/bsd.subdir.mk Wed Nov 7 21:44:04 2012(r242710)
+++ head/share/mk/bsd.subdir.mk Wed Nov 7 22:02:02 2012(r242711)
@@ -29,6 +29,9 @@
# maninstall, manlint, obj, objlink, realinstall, regress, tags
#
+.if !target()
+:
+
.include
DISTRIBUTION?= base
@@ -92,3 +95,5 @@ afterinstall:
in
svn commit: r242712 - head/share/mk
Author: sjg
Date: Wed Nov 7 22:02:53 2012
New Revision: 242712
URL: http://svnweb.freebsd.org/changeset/base/242712
Log:
Add ATF and reformat to ease reviews
Approved by: marcel (mentor)
Modified:
head/share/mk/Makefile
Modified: head/share/mk/Makefile
==
--- head/share/mk/Makefile Wed Nov 7 22:02:02 2012(r242711)
+++ head/share/mk/Makefile Wed Nov 7 22:02:53 2012(r242712)
@@ -1,20 +1,50 @@
# $FreeBSD$
# @(#)Makefile8.1 (Berkeley) 6/8/93
-FILES= bsd.README
-FILES+=bsd.arch.inc.mk
-FILES+=bsd.compat.mk bsd.compiler.mk bsd.cpu.mk
-FILES+=bsd.dep.mk bsd.doc.mk bsd.dtrace.mk
-FILES+=bsd.endian.mk
-FILES+=bsd.files.mk bsd.crunchgen.mk bsd.incs.mk bsd.info.mk
bsd.init.mk
-FILES+=bsd.kmod.mk
-FILES+=bsd.lib.mk bsd.libnames.mk bsd.links.mk bsd.man.mk bsd.nls.mk
-FILES+=bsd.obj.mk bsd.own.mk
-FILES+=bsd.port.mk bsd.port.options.mk bsd.port.post.mk
-FILES+=bsd.port.pre.mk bsd.port.subdir.mk bsd.prog.mk
-FILES+=bsd.snmpmod.mk bsd.subdir.mk bsd.sys.mk bsd.symver.mk
-FILES+=sys.mk version_gen.awk
+.include
+
+FILES= \
+ bsd.README \
+ bsd.arch.inc.mk \
+ bsd.compat.mk \
+ bsd.compiler.mk \
+ bsd.cpu.mk \
+ bsd.crunchgen.mk \
+ bsd.dep.mk \
+ bsd.doc.mk \
+ bsd.dtrace.mk \
+ bsd.endian.mk \
+ bsd.files.mk \
+ bsd.incs.mk \
+ bsd.info.mk \
+ bsd.init.mk \
+ bsd.kmod.mk \
+ bsd.lib.mk \
+ bsd.libnames.mk \
+ bsd.links.mk \
+ bsd.man.mk \
+ bsd.nls.mk \
+ bsd.obj.mk \
+ bsd.own.mk \
+ bsd.port.mk \
+ bsd.port.options.mk \
+ bsd.port.post.mk \
+ bsd.port.pre.mk \
+ bsd.port.subdir.mk \
+ bsd.prog.mk \
+ bsd.snmpmod.mk \
+ bsd.subdir.mk \
+ bsd.symver.mk \
+ bsd.sys.mk \
+ bsd.test.mk \
+ sys.mk \
+ version_gen.awk
+
NO_OBJ=
FILESDIR= ${BINDIR}/mk
+.if ${MK_ATF} != "no"
+FILES+=atf.test.mk
+.endif
+
.include
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r242713 - head/lib/libcrypt/tests
Author: sjg
Date: Wed Nov 7 22:03:59 2012
New Revision: 242713
URL: http://svnweb.freebsd.org/changeset/base/242713
Log:
Simple unit-tests for libcrypt, to show how easy it is.
Approved by: marcel (mentor)
Added:
head/lib/libcrypt/tests/
head/lib/libcrypt/tests/Makefile (contents, props changed)
head/lib/libcrypt/tests/crypt_tests.c (contents, props changed)
Added: head/lib/libcrypt/tests/Makefile
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libcrypt/tests/MakefileWed Nov 7 22:03:59 2012
(r242713)
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+# exercise libcrypt
+
+TESTS_C= crypt_tests
+
+CFLAGS+= -I${.CURDIR:H}
+LDADD+= -L${.OBJDIR:H} -lcrypt
+
+.include
Added: head/lib/libcrypt/tests/crypt_tests.c
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libcrypt/tests/crypt_tests.c Wed Nov 7 22:03:59 2012
(r242713)
@@ -0,0 +1,54 @@
+#include
+__FBSDID("$FreeBSD$");
+
+#include
+#include
+#include
+
+#include
+
+#defineLEET "0.s0.l33t"
+
+ATF_TC(md5);
+ATF_TC_HEAD(md5, tc)
+{
+
+ atf_tc_set_md_var(tc, "descr", "Tests the MD5 based password hash");
+}
+
+ATF_TC_BODY(md5, tc)
+{
+ const char want[] = "$1$deadbeef$0Huu6KHrKLVWfqa4WljDE0";
+ char *pw;
+
+ pw = crypt(LEET, want);
+ ATF_CHECK_STREQ(pw, want);
+}
+
+ATF_TC(invalid);
+ATF_TC_HEAD(invalid, tc)
+{
+
+ atf_tc_set_md_var(tc, "descr", "Tests that invalid password fails");
+}
+
+ATF_TC_BODY(invalid, tc)
+{
+ const char want[] = "$1$cafebabe$0Huu6KHrKLVWfqa4WljDE0";
+ char *pw;
+
+ pw = crypt(LEET, want);
+ ATF_CHECK(strcmp(pw, want) != 0);
+}
+
+/*
+ * This function must not do anything except enumerate
+ * the test cases, else atf-run is likely to be upset.
+ */
+ATF_TP_ADD_TCS(tp)
+{
+
+ ATF_TP_ADD_TC(tp, md5);
+ ATF_TP_ADD_TC(tp, invalid);
+ return atf_no_error();
+}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r242102 - in head: contrib/bmake usr.bin/bmake
I aim to import bmake-20121109 soon (once I sort out svn 1.7.7 bug), will loook at this as well. On Wed, 14 Nov 2012 19:27:49 +, Chris Rees writes: >> > I was kicking the tires on this and noticed bmake is dynamically linked. >> > >> > Can you change it to being statically linked? ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r243105 - in vendor/NetBSD/bmake/dist: . unit-tests
Author: sjg
Date: Thu Nov 15 22:01:30 2012
New Revision: 243105
URL: http://svnweb.freebsd.org/changeset/base/243105
Log:
Import bmake-2012 - pick up fix for .ORDER
Approved by: marcel (mentor)
Added:
vendor/NetBSD/bmake/dist/unit-tests/order
Modified:
vendor/NetBSD/bmake/dist/ChangeLog
vendor/NetBSD/bmake/dist/FILES
vendor/NetBSD/bmake/dist/Makefile.in
vendor/NetBSD/bmake/dist/cond.c
vendor/NetBSD/bmake/dist/make.c
vendor/NetBSD/bmake/dist/unit-tests/Makefile.in
vendor/NetBSD/bmake/dist/unit-tests/test.exp
Modified: vendor/NetBSD/bmake/dist/ChangeLog
==
--- vendor/NetBSD/bmake/dist/ChangeLog Thu Nov 15 21:22:50 2012
(r243104)
+++ vendor/NetBSD/bmake/dist/ChangeLog Thu Nov 15 22:01:30 2012
(r243105)
@@ -1,3 +1,28 @@
+2012-11-11 Simon J. Gerraty
+
+ * Makefile.in (MAKE_VERSION): 2012
+ fix generation of bmake.cat1
+
+2012-11-09 Simon J. Gerraty
+
+ * Makefile.in (MAKE_VERSION): 20121109
+ Merge with NetBSD make, pick up
+ o make.c: MakeBuildChild: return 0 so search continues if a
+ .ORDER dependency is detected.
+ o unit-tests/order: test the above
+
+2012-11-02 Simon J. Gerraty
+
+ * Makefile.in (MAKE_VERSION): 20121102
+ Merge with NetBSD make, pick up
+ o cond.c: allow cond_state[] to grow.
+ In meta mode with a very large tree, we can hit the limit
+ while processing dirdeps.
+
+2012-10-25 Simon J. Gerraty
+
+ * Makefile.in: we need to use ${srcdir} not ${.CURDIR}
+
2012-10-10 Simon J. Gerraty
* Makefile.in (MAKE_VERSION): 20121010
Modified: vendor/NetBSD/bmake/dist/FILES
==
--- vendor/NetBSD/bmake/dist/FILES Thu Nov 15 21:22:50 2012
(r243104)
+++ vendor/NetBSD/bmake/dist/FILES Thu Nov 15 22:01:30 2012
(r243105)
@@ -110,6 +110,7 @@ unit-tests/modmisc
unit-tests/modorder
unit-tests/modts
unit-tests/modword
+unit-tests/order
unit-tests/phony-end
unit-tests/posix
unit-tests/qequals
Modified: vendor/NetBSD/bmake/dist/Makefile.in
==
--- vendor/NetBSD/bmake/dist/Makefile.inThu Nov 15 21:22:50 2012
(r243104)
+++ vendor/NetBSD/bmake/dist/Makefile.inThu Nov 15 22:01:30 2012
(r243105)
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.56 2012/05/30 21:54:23 sjg Exp $
# @(#)Makefile5.2 (Berkeley) 12/28/90
-# $Id: Makefile.in,v 1.174 2012/10/10 18:46:24 sjg Exp $
+# $Id: Makefile.in,v 1.178 2012/11/15 16:48:59 sjg Exp $
PROG= bmake
SRCS= arch.c buf.c compat.c cond.c dir.c for.c hash.c job.c main.c \
@@ -21,7 +21,7 @@ srcdir= @srcdir@
CC?= @CC@
# Base version on src date
-MAKE_VERSION= 20121010
+MAKE_VERSION= 2012
MACHINE=@machine@
MACHINE_ARCH=@machine_arch@
DEFAULT_SYS_PATH = @default_sys_path@
@@ -114,7 +114,7 @@ ${MAN}: make.1 my.history
@echo making ${PROG}.1
@sed -e 's/^.Nx/NetBSD/' -e '/^.Nm/s/make/${PROG}/' \
-e '/^.Sh HISTORY/rmy.history' \
- -e '/^.Sh HISTORY/,$$s,^.Nm,make,' ${.CURDIR}/make.1 > $@
+ -e '/^.Sh HISTORY/,$$s,^.Nm,make,' ${srcdir}/make.1 > $@
.endif
Modified: vendor/NetBSD/bmake/dist/cond.c
==
--- vendor/NetBSD/bmake/dist/cond.c Thu Nov 15 21:22:50 2012
(r243104)
+++ vendor/NetBSD/bmake/dist/cond.c Thu Nov 15 22:01:30 2012
(r243105)
@@ -1,4 +1,4 @@
-/* $NetBSD: cond.c,v 1.64 2012/06/12 19:21:50 joerg Exp $ */
+/* $NetBSD: cond.c,v 1.67 2012/11/03 13:59:27 christos Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: cond.c,v 1.64 2012/06/12 19:21:50 joerg Exp $";
+static char rcsid[] = "$NetBSD: cond.c,v 1.67 2012/11/03 13:59:27 christos Exp
$";
#else
#include
#ifndef lint
#if 0
static char sccsid[] = "@(#)cond.c 8.2 (Berkeley) 1/2/94";
#else
-__RCSID("$NetBSD: cond.c,v 1.64 2012/06/12 19:21:50 joerg Exp $");
+__RCSID("$NetBSD: cond.c,v 1.67 2012/11/03 13:59:27 christos Exp $");
#endif
#endif /* not lint */
#endif
@@ -1227,7 +1227,8 @@ do_Cond_EvalExpression(Boolean *value)
int
Cond_Eval(char *line)
{
-#defineMAXIF 128 /* maximum depth of .if'ing */
+#defineMAXIF 128 /* maximum depth of .if'ing */
+#defineMAXIF_BUMP 32 /* how much to grow by */
enum if_states {
IF_ACTIVE, /* .if or .elif part active */
ELSE_ACTIVE,/* .else part active */
@@ -1235,7 +1236,8 @@ C
svn commit: r243106 - vendor/NetBSD/bmake/bmake-20121111
Author: sjg Date: Thu Nov 15 22:05:18 2012 New Revision: 243106 URL: http://svnweb.freebsd.org/changeset/base/243106 Log: Tag bmake-2012 Approved by: marcel (mentor) Added: vendor/NetBSD/bmake/bmake-2012/ - copied from r243105, vendor/NetBSD/bmake/dist/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r243115 - in head: contrib/bmake contrib/bmake/unit-tests usr.bin/bmake usr.bin/bmake/unit-tests
Author: sjg
Date: Fri Nov 16 01:37:25 2012
New Revision: 243115
URL: http://svnweb.freebsd.org/changeset/base/243115
Log:
Merge bmake-2012
Also pay attention to MK_SHARED_TOOLCHAIN.
Approved by: marcel (mentor)
Added:
head/contrib/bmake/unit-tests/order
- copied unchanged from r243106, vendor/NetBSD/bmake/dist/unit-tests/order
Modified:
head/contrib/bmake/ChangeLog
head/contrib/bmake/FILES
head/contrib/bmake/Makefile.in
head/contrib/bmake/cond.c
head/contrib/bmake/make.c
head/contrib/bmake/unit-tests/Makefile.in
head/contrib/bmake/unit-tests/test.exp
head/usr.bin/bmake/Makefile
head/usr.bin/bmake/Makefile.inc
head/usr.bin/bmake/unit-tests/Makefile
Directory Properties:
head/contrib/bmake/ (props changed)
Modified: head/contrib/bmake/ChangeLog
==
--- head/contrib/bmake/ChangeLogFri Nov 16 01:24:11 2012
(r243114)
+++ head/contrib/bmake/ChangeLogFri Nov 16 01:37:25 2012
(r243115)
@@ -1,3 +1,28 @@
+2012-11-11 Simon J. Gerraty
+
+ * Makefile.in (MAKE_VERSION): 2012
+ fix generation of bmake.cat1
+
+2012-11-09 Simon J. Gerraty
+
+ * Makefile.in (MAKE_VERSION): 20121109
+ Merge with NetBSD make, pick up
+ o make.c: MakeBuildChild: return 0 so search continues if a
+ .ORDER dependency is detected.
+ o unit-tests/order: test the above
+
+2012-11-02 Simon J. Gerraty
+
+ * Makefile.in (MAKE_VERSION): 20121102
+ Merge with NetBSD make, pick up
+ o cond.c: allow cond_state[] to grow.
+ In meta mode with a very large tree, we can hit the limit
+ while processing dirdeps.
+
+2012-10-25 Simon J. Gerraty
+
+ * Makefile.in: we need to use ${srcdir} not ${.CURDIR}
+
2012-10-10 Simon J. Gerraty
* Makefile.in (MAKE_VERSION): 20121010
Modified: head/contrib/bmake/FILES
==
--- head/contrib/bmake/FILESFri Nov 16 01:24:11 2012(r243114)
+++ head/contrib/bmake/FILESFri Nov 16 01:37:25 2012(r243115)
@@ -110,6 +110,7 @@ unit-tests/modmisc
unit-tests/modorder
unit-tests/modts
unit-tests/modword
+unit-tests/order
unit-tests/phony-end
unit-tests/posix
unit-tests/qequals
Modified: head/contrib/bmake/Makefile.in
==
--- head/contrib/bmake/Makefile.in Fri Nov 16 01:24:11 2012
(r243114)
+++ head/contrib/bmake/Makefile.in Fri Nov 16 01:37:25 2012
(r243115)
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.56 2012/05/30 21:54:23 sjg Exp $
# @(#)Makefile5.2 (Berkeley) 12/28/90
-# $Id: Makefile.in,v 1.174 2012/10/10 18:46:24 sjg Exp $
+# $Id: Makefile.in,v 1.178 2012/11/15 16:48:59 sjg Exp $
PROG= bmake
SRCS= arch.c buf.c compat.c cond.c dir.c for.c hash.c job.c main.c \
@@ -21,7 +21,7 @@ srcdir= @srcdir@
CC?= @CC@
# Base version on src date
-MAKE_VERSION= 20121010
+MAKE_VERSION= 2012
MACHINE=@machine@
MACHINE_ARCH=@machine_arch@
DEFAULT_SYS_PATH = @default_sys_path@
@@ -114,7 +114,7 @@ ${MAN}: make.1 my.history
@echo making ${PROG}.1
@sed -e 's/^.Nx/NetBSD/' -e '/^.Nm/s/make/${PROG}/' \
-e '/^.Sh HISTORY/rmy.history' \
- -e '/^.Sh HISTORY/,$$s,^.Nm,make,' ${.CURDIR}/make.1 > $@
+ -e '/^.Sh HISTORY/,$$s,^.Nm,make,' ${srcdir}/make.1 > $@
.endif
Modified: head/contrib/bmake/cond.c
==
--- head/contrib/bmake/cond.c Fri Nov 16 01:24:11 2012(r243114)
+++ head/contrib/bmake/cond.c Fri Nov 16 01:37:25 2012(r243115)
@@ -1,4 +1,4 @@
-/* $NetBSD: cond.c,v 1.64 2012/06/12 19:21:50 joerg Exp $ */
+/* $NetBSD: cond.c,v 1.67 2012/11/03 13:59:27 christos Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: cond.c,v 1.64 2012/06/12 19:21:50 joerg Exp $";
+static char rcsid[] = "$NetBSD: cond.c,v 1.67 2012/11/03 13:59:27 christos Exp
$";
#else
#include
#ifndef lint
#if 0
static char sccsid[] = "@(#)cond.c 8.2 (Berkeley) 1/2/94";
#else
-__RCSID("$NetBSD: cond.c,v 1.64 2012/06/12 19:21:50 joerg Exp $");
+__RCSID("$NetBSD: cond.c,v 1.67 2012/11/03 13:59:27 christos Exp $");
#endif
#endif /* not lint */
#endif
@@ -1227,7 +1227,8 @@ do_Cond_EvalExpression(Boolean *value)
int
Cond_Eval(char *line)
{
-#defineMAXIF 128 /* maximum depth of .if'ing */
+#defineMAXIF 128 /* maximum depth of .if'ing */
+#defineMAXIF_BUMP 32 /* how much to grow by */
enum if_states {
Re: svn commit: r236338 - head/usr.bin/make
Hi Kevin, On Wed, 30 May 2012 22:45:57 -0400, "Kevin P. Neal" writes: >> Deprecate the FreeBSD make's ":U" (to-upper case) and ":L" (to-lower case) >> modifiers for ":tu" and ":tl" from OSF's ODE, which made its way into >> NetBSD's make, which is the source for the Portable Berkeley Make. > >This is an incorrect history. I'm the source of NetBSD make's ":tu" and ":tl" >modifiers. The closest I've ever come to OSF ODE is reading about it a little >in NetBSD make's man page. Yes, you are right, :t* were not from ODE. I think David was refering to the :L and :U modifiers that (as you noted) I added to NetBSD make along with :D, :P, and :@, that all originated in ODE. This patch adds :tu and :tl as aliases for freebsd's :U and :L, so that makefiles at least can start to converge. --sjg ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r246149 - in vendor/NetBSD/bmake/dist: . mk mk/sys unit-tests
Author: sjg Date: Thu Jan 31 16:44:23 2013 New Revision: 246149 URL: http://svnweb.freebsd.org/changeset/base/246149 Log: Import bmake-20130123 Approved by: marcel (mentor) Added: vendor/NetBSD/bmake/dist/Makefile (contents, props changed) vendor/NetBSD/bmake/dist/Makefile.config.in (contents, props changed) vendor/NetBSD/bmake/dist/makefile.in (contents, props changed) vendor/NetBSD/bmake/dist/mk/ vendor/NetBSD/bmake/dist/mk/ChangeLog vendor/NetBSD/bmake/dist/mk/FILES vendor/NetBSD/bmake/dist/mk/README vendor/NetBSD/bmake/dist/mk/auto.dep.mk vendor/NetBSD/bmake/dist/mk/auto.obj.mk vendor/NetBSD/bmake/dist/mk/autoconf.mk vendor/NetBSD/bmake/dist/mk/autodep.mk vendor/NetBSD/bmake/dist/mk/dep.mk vendor/NetBSD/bmake/dist/mk/dirdeps.mk vendor/NetBSD/bmake/dist/mk/doc.mk vendor/NetBSD/bmake/dist/mk/dpadd.mk vendor/NetBSD/bmake/dist/mk/final.mk vendor/NetBSD/bmake/dist/mk/gendirdeps.mk vendor/NetBSD/bmake/dist/mk/host-target.mk vendor/NetBSD/bmake/dist/mk/host.libnames.mk vendor/NetBSD/bmake/dist/mk/inc.mk vendor/NetBSD/bmake/dist/mk/init.mk vendor/NetBSD/bmake/dist/mk/install-mk vendor/NetBSD/bmake/dist/mk/install-new.mk vendor/NetBSD/bmake/dist/mk/java.mk vendor/NetBSD/bmake/dist/mk/lib.mk vendor/NetBSD/bmake/dist/mk/libnames.mk vendor/NetBSD/bmake/dist/mk/libs.mk vendor/NetBSD/bmake/dist/mk/links.mk vendor/NetBSD/bmake/dist/mk/man.mk vendor/NetBSD/bmake/dist/mk/meta.autodep.mk vendor/NetBSD/bmake/dist/mk/meta.stage.mk vendor/NetBSD/bmake/dist/mk/meta.subdir.mk vendor/NetBSD/bmake/dist/mk/meta.sys.mk vendor/NetBSD/bmake/dist/mk/meta2deps.py (contents, props changed) vendor/NetBSD/bmake/dist/mk/meta2deps.sh (contents, props changed) vendor/NetBSD/bmake/dist/mk/mk-files.txt (contents, props changed) vendor/NetBSD/bmake/dist/mk/nls.mk vendor/NetBSD/bmake/dist/mk/obj.mk vendor/NetBSD/bmake/dist/mk/options.mk vendor/NetBSD/bmake/dist/mk/own.mk vendor/NetBSD/bmake/dist/mk/prlist.mk vendor/NetBSD/bmake/dist/mk/prog.mk vendor/NetBSD/bmake/dist/mk/progs.mk vendor/NetBSD/bmake/dist/mk/rst2htm.mk vendor/NetBSD/bmake/dist/mk/scripts.mk vendor/NetBSD/bmake/dist/mk/srctop.mk vendor/NetBSD/bmake/dist/mk/subdir.mk vendor/NetBSD/bmake/dist/mk/sys/ vendor/NetBSD/bmake/dist/mk/sys.clean-env.mk vendor/NetBSD/bmake/dist/mk/sys.dependfile.mk vendor/NetBSD/bmake/dist/mk/sys.mk vendor/NetBSD/bmake/dist/mk/sys/AIX.mk vendor/NetBSD/bmake/dist/mk/sys/Darwin.mk vendor/NetBSD/bmake/dist/mk/sys/Generic.mk vendor/NetBSD/bmake/dist/mk/sys/HP-UX.mk vendor/NetBSD/bmake/dist/mk/sys/IRIX.mk vendor/NetBSD/bmake/dist/mk/sys/Linux.mk vendor/NetBSD/bmake/dist/mk/sys/NetBSD.mk vendor/NetBSD/bmake/dist/mk/sys/OSF1.mk vendor/NetBSD/bmake/dist/mk/sys/OpenBSD.mk vendor/NetBSD/bmake/dist/mk/sys/SunOS.mk vendor/NetBSD/bmake/dist/mk/sys/UnixWare.mk vendor/NetBSD/bmake/dist/mk/target-flags.mk vendor/NetBSD/bmake/dist/mk/warnings.mk vendor/NetBSD/bmake/dist/mk/yacc.mk Deleted: vendor/NetBSD/bmake/dist/Makefile.in Modified: vendor/NetBSD/bmake/dist/ChangeLog vendor/NetBSD/bmake/dist/FILES vendor/NetBSD/bmake/dist/bmake.1 vendor/NetBSD/bmake/dist/bmake.cat1 vendor/NetBSD/bmake/dist/boot-strap vendor/NetBSD/bmake/dist/bsd.after-import.mk vendor/NetBSD/bmake/dist/compat.c vendor/NetBSD/bmake/dist/configure vendor/NetBSD/bmake/dist/configure.in vendor/NetBSD/bmake/dist/job.c vendor/NetBSD/bmake/dist/main.c vendor/NetBSD/bmake/dist/make-bootstrap.sh.in vendor/NetBSD/bmake/dist/make.1 vendor/NetBSD/bmake/dist/meta.c vendor/NetBSD/bmake/dist/realpath.c vendor/NetBSD/bmake/dist/unit-tests/Makefile.in vendor/NetBSD/bmake/dist/var.c Modified: vendor/NetBSD/bmake/dist/ChangeLog == --- vendor/NetBSD/bmake/dist/ChangeLog Thu Jan 31 16:39:50 2013 (r246148) +++ vendor/NetBSD/bmake/dist/ChangeLog Thu Jan 31 16:44:23 2013 (r246149) @@ -1,3 +1,35 @@ +2013-01-27 Simon J. Gerraty + + * Merge with NetBSD make, pick up + o make.1: more info on how shell commands are handled. + o job.c,main.c: detect write errors to job pipes. + +2013-01-25 Simon J. Gerraty + + * Makefile (MAKE_VERSION): 20130123 + Merge with NetBSD make, pick up + o meta.c: if script uses .OODATE and meta_oodate() decides + rebuild is needed, .OODATE will be empty - set it to .ALLSRC. + o var.c: in debug output indicate which variabale modifiers + apply to. + o remove Check_Cwd logic the makefiles have been fixed. + +2012-12-12 Simon J. Gerraty + + * makefile.in: add a simple makefile for folk who insist on + ./configure; make; make install + it just runs boot-strap + * include mk/* to accommodate the above + * boot-strap: re-work to accommodate the above + mksrc defaults to $Mydir/mk + allow
svn commit: r246150 - vendor/NetBSD/bmake/20130123
Author: sjg Date: Thu Jan 31 16:47:34 2013 New Revision: 246150 URL: http://svnweb.freebsd.org/changeset/base/246150 Log: Tag bmake-20130123 Approved by: marcel (mentor) Added: vendor/NetBSD/bmake/20130123/ - copied from r246149, vendor/NetBSD/bmake/dist/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
