svn commit: r325340 - in head: contrib/bmake contrib/bmake/mk contrib/bmake/unit-tests usr.bin/bmake
Simon J. Gerraty
sjg at FreeBSD.org
Thu Nov 2 20:08:03 UTC 2017
Author: sjg
Date: Thu Nov 2 20:08:00 2017
New Revision: 325340
URL: https://svnweb.freebsd.org/changeset/base/325340
Log:
Update to bmake-20171028
Ignore empty MAKEOBJDIR[PREFIX]
Reported by: bdrewery
Added:
head/contrib/bmake/VERSION
- copied unchanged from r325339, vendor/NetBSD/bmake/dist/VERSION
Modified:
head/contrib/bmake/ChangeLog
head/contrib/bmake/FILES
head/contrib/bmake/Makefile
head/contrib/bmake/Makefile.config.in
head/contrib/bmake/bsd.after-import.mk
head/contrib/bmake/configure
head/contrib/bmake/configure.in
head/contrib/bmake/machine.sh
head/contrib/bmake/main.c
head/contrib/bmake/make-bootstrap.sh.in
head/contrib/bmake/meta.c
head/contrib/bmake/mk/ChangeLog
head/contrib/bmake/mk/autoconf.mk
head/contrib/bmake/mk/dirdeps.mk
head/contrib/bmake/mk/dpadd.mk
head/contrib/bmake/mk/gendirdeps.mk
head/contrib/bmake/mk/install-mk
head/contrib/bmake/mk/meta.autodep.mk
head/contrib/bmake/mk/meta.stage.mk
head/contrib/bmake/mk/sys.clean-env.mk
head/contrib/bmake/mk/whats.mk
head/contrib/bmake/os.sh
head/contrib/bmake/unit-tests/dotwait.exp
head/contrib/bmake/unit-tests/dotwait.mk
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/ChangeLog Thu Nov 2 19:53:51 2017 (r325339)
+++ head/contrib/bmake/ChangeLog Thu Nov 2 20:08:00 2017 (r325340)
@@ -1,3 +1,36 @@
+2017-10-28 Simon J. Gerraty <sjg at bad.crufty.net>
+
+ * VERSION: 20171028
+ Merge with NetBSD make, pick up
+ o main.c: ignore empty MAKEOBJDIR
+
+ * Makefile.config.in:
+ make @prefix@ @machine*@ and @default_sys_path@ defaults.
+
+2017-10-05 Simon J. Gerraty <sjg at bad.crufty.net>
+
+ * VERSION: 20171005
+
+ * unit-tests/dotwait.mk: redirect stderr through pipe for more
+ consistent result on some platforms.
+
+2017-08-13 Simon J. Gerraty <sjg at bad.crufty.net>
+
+ * machine.sh: entry for AIX
+
+2017-08-12 Simon J. Gerraty <sjg at bad.crufty.net>
+
+ * VERSION (_MAKE_VERSION): Move the setting of _MAKE_VERSION
+ to a file that can be included by configure as well as make.
+ This allows configure to set set _MAKE_VERSION in make-bootstrap.sh
+
+2017-08-10 Simon J. Gerraty <sjg at bad.crufty.net>
+
+ * Makefile (_MAKE_VERSION): 20170810
+ Merge with NetBSD make, pick up
+ o meta.c: if target is in subdir we only need subdir name in
+ meta_name.
+
2017-07-20 Simon J. Gerraty <sjg at bad.crufty.net>
* Makefile (_MAKE_VERSION): 20170720
Modified: head/contrib/bmake/FILES
==============================================================================
--- head/contrib/bmake/FILES Thu Nov 2 19:53:51 2017 (r325339)
+++ head/contrib/bmake/FILES Thu Nov 2 20:08:00 2017 (r325340)
@@ -5,6 +5,7 @@ Makefile.config.in
PSD.doc/Makefile
PSD.doc/tutorial.ms
README
+VERSION
aclocal.m4
arch.c
bmake.1
Modified: head/contrib/bmake/Makefile
==============================================================================
--- head/contrib/bmake/Makefile Thu Nov 2 19:53:51 2017 (r325339)
+++ head/contrib/bmake/Makefile Thu Nov 2 20:08:00 2017 (r325340)
@@ -1,8 +1,5 @@
-# $Id: Makefile,v 1.95 2017/07/20 19:36:13 sjg Exp $
+# $Id: Makefile,v 1.99 2017/08/13 20:12:53 sjg Exp $
-# Base version on src date
-_MAKE_VERSION= 20170720
-
PROG= bmake
SRCS= \
@@ -58,6 +55,8 @@ SRCS+= \
lstReplace.c \
lstSucc.c
+.-include "VERSION"
+
# this file gets generated by configure
.-include "Makefile.config"
@@ -192,11 +191,13 @@ MANDIR= ${MANDIR.bmake:U${SHAREDIR}/man}
${OBJS}: config.h
.endif
+# start-delete2 for bsd.after-import.mk
+
# make sure that MAKE_VERSION gets updated.
-main.o: ${SRCS} ${MAKEFILE}
+main.o: ${SRCS} ${.CURDIR}/VERSION
-# start-delete2 for bsd.after-import.mk
.if ${MK_AUTOCONF_MK} == "yes"
+CONFIGURE_DEPS += ${.CURDIR}/VERSION
.include <autoconf.mk>
.endif
SHARE_MK?=${SHAREDIR}/mk
Modified: head/contrib/bmake/Makefile.config.in
==============================================================================
--- head/contrib/bmake/Makefile.config.in Thu Nov 2 19:53:51 2017 (r325339)
+++ head/contrib/bmake/Makefile.config.in Thu Nov 2 20:08:00 2017 (r325340)
@@ -1,11 +1,13 @@
# things set by configure
-prefix= @prefix@
+_MAKE_VERSION=@_MAKE_VERSION@
+
+prefix?= @prefix@
srcdir= @srcdir@
CC?= @CC@
-MACHINE= @machine@
-MACHINE_ARCH= @machine_arch@
-DEFAULT_SYS_PATH= @default_sys_path@
+MACHINE?= @machine@
+MACHINE_ARCH?= @machine_arch@
+DEFAULT_SYS_PATH?= @default_sys_path@
CPPFLAGS+= @CPPFLAGS@
CFLAGS+= ${CPPFLAGS} @DEFS@
@@ -17,4 +19,3 @@ FILEMON_H= @filemon_h@
BMAKE_PATH_MAX?= @bmake_path_max@
# used if MAXPATHLEN not defined
CPPFLAGS+= -DBMAKE_PATH_MAX=${BMAKE_PATH_MAX}
-
Copied: head/contrib/bmake/VERSION (from r325339, vendor/NetBSD/bmake/dist/VERSION)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/contrib/bmake/VERSION Thu Nov 2 20:08:00 2017 (r325340, copy of r325339, vendor/NetBSD/bmake/dist/VERSION)
@@ -0,0 +1,2 @@
+# keep this compatible with sh and make
+_MAKE_VERSION=20171028
Modified: head/contrib/bmake/bsd.after-import.mk
==============================================================================
--- head/contrib/bmake/bsd.after-import.mk Thu Nov 2 19:53:51 2017 (r325339)
+++ head/contrib/bmake/bsd.after-import.mk Thu Nov 2 20:08:00 2017 (r325340)
@@ -1,4 +1,4 @@
-# $Id: bsd.after-import.mk,v 1.12 2014/02/14 23:45:49 sjg Exp $
+# $Id: bsd.after-import.mk,v 1.13 2017/08/13 00:56:10 sjg Exp $
# This makefile is for use when integrating bmake into a BSD build
# system. Use this makefile after importing bmake.
@@ -56,6 +56,7 @@ bootstrap: ${BMAKE_SRC}/boot-strap ${MAKEFILE}
# Makefiles need a little more tweaking than say config.h
MAKEFILE_SED = sed -e '/^MACHINE/d' \
+ -e '/include.*VERSION/d' \
-e '/^PROG/ { s,=,?=,;s,bmake,$${.CURDIR:T},; }' \
-e 's,^.-include,.sinclude,' \
-e '/^\..*include *</ { s,<,<bsd.,;/autoconf/d; }' \
Modified: head/contrib/bmake/configure
==============================================================================
Binary file (source and/or target). No diff available.
Modified: head/contrib/bmake/configure.in
==============================================================================
--- head/contrib/bmake/configure.in Thu Nov 2 19:53:51 2017 (r325339)
+++ head/contrib/bmake/configure.in Thu Nov 2 20:08:00 2017 (r325340)
@@ -1,11 +1,11 @@
dnl
dnl RCSid:
-dnl $Id: configure.in,v 1.57 2016/06/07 00:49:44 sjg Exp $
+dnl $Id: configure.in,v 1.58 2017/08/13 00:56:10 sjg Exp $
dnl
dnl Process this file with autoconf to produce a configure script
dnl
AC_PREREQ(2.50)
-AC_INIT([bmake], [20160606], [sjg at NetBSD.org])
+AC_INIT([bmake], [20170812], [sjg at NetBSD.org])
AC_CONFIG_HEADERS(config.h)
dnl make srcdir absolute
@@ -14,6 +14,9 @@ case "$srcdir" in
*) srcdir=`cd $srcdir && pwd`;;
esac
+dnl get _MAKE_VERSION
+. $srcdir/VERSION
+
dnl
AC_ARG_WITH(defshell,
[ --with-defshell=SHELL use SHELL by default - must be sh compatible, use sh or ksh to pick the internal definitions],
@@ -386,6 +389,7 @@ AC_SUBST(GCC)
AC_SUBST(diff_u)
AC_SUBST(use_meta)
AC_SUBST(filemon_h)
+AC_SUBST(_MAKE_VERSION)
AC_OUTPUT(makefile Makefile.config make-bootstrap.sh unit-tests/Makefile)
cat <<EOF
Modified: head/contrib/bmake/machine.sh
==============================================================================
--- head/contrib/bmake/machine.sh Thu Nov 2 19:53:51 2017 (r325339)
+++ head/contrib/bmake/machine.sh Thu Nov 2 20:08:00 2017 (r325340)
@@ -2,7 +2,7 @@
# derrived from /etc/rc_d/os.sh
# RCSid:
-# $Id: machine.sh,v 1.17 2015/05/05 00:10:54 sjg Exp $
+# $Id: machine.sh,v 1.18 2017/08/13 19:11:28 sjg Exp $
#
# @(#) Copyright (c) 1994-2002 Simon J. Gerraty
#
@@ -44,6 +44,12 @@ Which() {
}
case $OS in
+AIX) # from http://gnats.netbsd.org/29386
+ OSMAJOR=`uname -v`
+ OSMINOR=`uname -r`
+ MACHINE=$OS$OSMAJOR.$OSMINOR
+ MACHINE_ARCH=`bootinfo -T`
+ ;;
OpenBSD)
MACHINE=$OS$OSMAJOR.$machine
arch=`Which arch /usr/bin:/usr/ucb:$PATH`
Modified: head/contrib/bmake/main.c
==============================================================================
--- head/contrib/bmake/main.c Thu Nov 2 19:53:51 2017 (r325339)
+++ head/contrib/bmake/main.c Thu Nov 2 20:08:00 2017 (r325340)
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.272 2017/06/19 19:58:24 christos Exp $ */
+/* $NetBSD: main.c,v 1.273 2017/10/28 21:54:54 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.272 2017/06/19 19:58:24 christos Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.273 2017/10/28 21:54:54 sjg Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
@@ -81,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993
#if 0
static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: main.c,v 1.272 2017/06/19 19:58:24 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.273 2017/10/28 21:54:54 sjg Exp $");
#endif
#endif /* not lint */
#endif
@@ -792,7 +792,8 @@ Main_SetVarObjdir(const char *var, const char *suffix)
{
char *p, *path, *xpath;
- if ((path = Var_Value(var, VAR_CMD, &p)) == NULL)
+ if ((path = Var_Value(var, VAR_CMD, &p)) == NULL ||
+ *path == '\0')
return FALSE;
/* expand variable substitutions */
Modified: head/contrib/bmake/make-bootstrap.sh.in
==============================================================================
--- head/contrib/bmake/make-bootstrap.sh.in Thu Nov 2 19:53:51 2017 (r325339)
+++ head/contrib/bmake/make-bootstrap.sh.in Thu Nov 2 20:08:00 2017 (r325340)
@@ -13,7 +13,7 @@ esac
CC="@CC@"
CFLAGS="@CFLAGS@ -I. -I${srcdir} @DEFS@ @CPPFLAGS@ -DMAKE_NATIVE ${XDEFS} -DBMAKE_PATH_MAX=@bmake_path_max@"
-MAKE_VERSION=`sed -n '/^_MAKE_VERSION=/s,.*=[^0-9]*,,p' $srcdir/Makefile`
+MAKE_VERSION=@_MAKE_VERSION@
MDEFS="-DMAKE_VERSION=\"$MAKE_VERSION\" \
-D at force_machine@MACHINE=\"@machine@\" -DMACHINE_ARCH=\"@machine_arch@\" \
Modified: head/contrib/bmake/meta.c
==============================================================================
--- head/contrib/bmake/meta.c Thu Nov 2 19:53:51 2017 (r325339)
+++ head/contrib/bmake/meta.c Thu Nov 2 20:08:00 2017 (r325340)
@@ -1,4 +1,4 @@
-/* $NetBSD: meta.c,v 1.68 2017/07/09 04:54:00 sjg Exp $ */
+/* $NetBSD: meta.c,v 1.69 2017/08/10 21:07:48 sjg Exp $ */
/*
* Implement 'meta' mode.
@@ -250,6 +250,8 @@ meta_name(char *mname, size_t mnamelen,
char *rp;
char *cp;
char *tp;
+ char *dtp;
+ size_t ldname;
/*
* Weed out relative paths from the target file name.
@@ -286,10 +288,15 @@ meta_name(char *mname, size_t mnamelen,
}
/* on some systems dirname may modify its arg */
tp = bmake_strdup(tname);
- if (strcmp(dname, dirname(tp)) == 0)
+ dtp = dirname(tp);
+ if (strcmp(dname, dtp) == 0)
snprintf(mname, mnamelen, "%s.meta", tname);
else {
- snprintf(mname, mnamelen, "%s/%s.meta", dname, tname);
+ ldname = strlen(dname);
+ if (strncmp(dname, dtp, ldname) == 0 && dtp[ldname] == '/')
+ snprintf(mname, mnamelen, "%s/%s.meta", dname, &tname[ldname+1]);
+ else
+ snprintf(mname, mnamelen, "%s/%s.meta", dname, tname);
/*
* Replace path separators in the file name after the
Modified: head/contrib/bmake/mk/ChangeLog
==============================================================================
--- head/contrib/bmake/mk/ChangeLog Thu Nov 2 19:53:51 2017 (r325339)
+++ head/contrib/bmake/mk/ChangeLog Thu Nov 2 20:08:00 2017 (r325340)
@@ -1,3 +1,21 @@
+2017-10-25 Simon J. Gerraty <sjg at bad.crufty.net>
+
+ * Allow for host32 on rare occasions.
+
+2017-10-18 Simon J. Gerraty <sjg at bad.crufty.net>
+
+ * install-mk (MK_VERSION): 20171018
+
+ * whats.mk: include what_thing in what_uuid to avoid problem
+ when building multiple apps in the same directory.
+
+2017-08-12 Simon J. Gerraty <sjg at bad.crufty.net>
+
+ * install-mk (MK_VERSION): 20170812
+
+ * autoconf.mk: Use CONFIGURE_DEPS so Makefile can
+ add dependencies for config.recheck and config.gen
+
2017-06-30 Simon J. Gerraty <sjg at bad.crufty.net>
* install-mk (MK_VERSION): 20170630
Modified: head/contrib/bmake/mk/autoconf.mk
==============================================================================
--- head/contrib/bmake/mk/autoconf.mk Thu Nov 2 19:53:51 2017 (r325339)
+++ head/contrib/bmake/mk/autoconf.mk Thu Nov 2 20:08:00 2017 (r325340)
@@ -1,4 +1,4 @@
-# $Id: autoconf.mk,v 1.8 2012/11/19 05:37:48 sjg Exp $
+# $Id: autoconf.mk,v 1.9 2017/08/13 20:03:13 sjg Exp $
#
# @(#) Copyright (c) 1996-2009, Simon J. Gerraty
#
@@ -15,8 +15,10 @@
.NOPATH: config.h config.status
+CONFIGURE_DEPS += ${.CURDIR}/config.h.in ${.CURDIR}/configure
+
.if !target(config.h)
-config.h: ${.CURDIR}/config.h.in config.status
+config.h: ${CONFIGURE_DEPS} config.status
./config.status
.endif
@@ -28,11 +30,11 @@ config.status: config.recheck
config.status: config.gen
.endif
-config.recheck: config.h.in ${.CURDIR}/configure
+config.recheck: ${CONFIGURE_DEPS}
./config.status --recheck
@touch $@
-config.gen: config.h.in ${.CURDIR}/configure
+config.gen: ${CONFIGURE_DEPS}
CC="${CC} ${CCMODE}" ${.CURDIR}/configure --no-create ${CONFIGURE_ARGS}
@touch $@ config.recheck
Modified: head/contrib/bmake/mk/dirdeps.mk
==============================================================================
--- head/contrib/bmake/mk/dirdeps.mk Thu Nov 2 19:53:51 2017 (r325339)
+++ head/contrib/bmake/mk/dirdeps.mk Thu Nov 2 20:08:00 2017 (r325340)
@@ -1,4 +1,4 @@
-# $Id: dirdeps.mk,v 1.89 2017/05/17 17:41:47 sjg Exp $
+# $Id: dirdeps.mk,v 1.90 2017/10/25 23:44:20 sjg Exp $
# Copyright (c) 2010-2013, Juniper Networks, Inc.
# All rights reserved.
@@ -536,9 +536,13 @@ _machines := ${DEP_MACHINE}
# this is the machine list we actually use below
_machines := ${_only_machines}
-.if defined(HOSTPROG) || ${DEP_MACHINE} == "host"
+.if defined(HOSTPROG) || ${DEP_MACHINE:Nhost*} == ""
# we need to build this guy's dependencies for host as well.
+.if ${DEP_MACHINE:Nhost*} == ""
+_machines += ${DEP_MACHINE}
+.else
_machines += host
+.endif
.endif
_machines := ${_machines:O:u}
Modified: head/contrib/bmake/mk/dpadd.mk
==============================================================================
--- head/contrib/bmake/mk/dpadd.mk Thu Nov 2 19:53:51 2017 (r325339)
+++ head/contrib/bmake/mk/dpadd.mk Thu Nov 2 20:08:00 2017 (r325340)
@@ -1,4 +1,4 @@
-# $Id: dpadd.mk,v 1.23 2017/02/13 16:46:01 sjg Exp $
+# $Id: dpadd.mk,v 1.24 2017/10/25 23:44:20 sjg Exp $
#
# @(#) Copyright (c) 2004, Simon J. Gerraty
#
@@ -195,7 +195,7 @@ __dpadd_incs += ${__dpadd_libs:O:u:@s@${SRC_LIBS_${s:T
__dpadd_last_incs += ${__dpadd_libs:u:@x@${INCLUDES_LAST_${x:T:R}}@}
__dpadd_last_incs += ${__dpadd_libs:O:u:@s@${SRC_LIBS_${s:T:R}:U}@:@x@${INCLUDES_LAST_${x:T:R}}@}
-.if defined(HOSTPROG) || ${MACHINE} == "host"
+.if defined(HOSTPROG) || ${MACHINE:Nhost*} == ""
# we want any -I/usr/* last
__dpadd_last_incs := \
${__dpadd_last_incs:N-I/usr/*} \
Modified: head/contrib/bmake/mk/gendirdeps.mk
==============================================================================
--- head/contrib/bmake/mk/gendirdeps.mk Thu Nov 2 19:53:51 2017 (r325339)
+++ head/contrib/bmake/mk/gendirdeps.mk Thu Nov 2 20:08:00 2017 (r325340)
@@ -1,4 +1,4 @@
-# $Id: gendirdeps.mk,v 1.33 2016/10/11 22:37:28 sjg Exp $
+# $Id: gendirdeps.mk,v 1.34 2017/10/26 00:46:26 sjg Exp $
# Copyright (c) 2010-2013, Juniper Networks, Inc.
# All rights reserved.
@@ -194,7 +194,7 @@ dpadd_dir_list += ${f:H:tA}
.endfor
.if !empty(ddep_list)
ddeps != cat ${ddep_list:O:u} | ${META2DEPS_FILTER} ${_skip_gendirdeps} \
- sed 's,//*$$,,;s,\.${HOST_TARGET}$$,.host,;s,\.${MACHINE}$$,,'
+ sed 's,//*$$,,;s,\.${HOST_TARGET:Uhost}$$,.host,;s,\.${HOST_TARGET32:Uhost32}$$,.host32,;s,\.${MACHINE}$$,,'
.if ${DEBUG_GENDIRDEPS:Uno:@x@${RELDIR:M$x}@} != ""
.info ${RELDIR}: raw_dir_list='${dir_list}'
Modified: head/contrib/bmake/mk/install-mk
==============================================================================
--- head/contrib/bmake/mk/install-mk Thu Nov 2 19:53:51 2017 (r325339)
+++ head/contrib/bmake/mk/install-mk Thu Nov 2 20:08:00 2017 (r325340)
@@ -55,7 +55,7 @@
# Simon J. Gerraty <sjg at crufty.net>
# RCSid:
-# $Id: install-mk,v 1.148 2017/06/30 23:46:15 sjg Exp $
+# $Id: install-mk,v 1.150 2017/10/19 03:50:51 sjg Exp $
#
# @(#) Copyright (c) 1994 Simon J. Gerraty
#
@@ -70,7 +70,7 @@
# sjg at crufty.net
#
-MK_VERSION=20170630
+MK_VERSION=20171018
OWNER=
GROUP=
MODE=444
Modified: head/contrib/bmake/mk/meta.autodep.mk
==============================================================================
--- head/contrib/bmake/mk/meta.autodep.mk Thu Nov 2 19:53:51 2017 (r325339)
+++ head/contrib/bmake/mk/meta.autodep.mk Thu Nov 2 20:08:00 2017 (r325340)
@@ -1,4 +1,4 @@
-# $Id: meta.autodep.mk,v 1.45 2016/06/03 17:22:32 sjg Exp $
+# $Id: meta.autodep.mk,v 1.46 2017/10/25 23:44:20 sjg Exp $
#
# @(#) Copyright (c) 2010, Simon J. Gerraty
@@ -261,7 +261,7 @@ META_FILES = ${.MAKE.META.FILES:T:N.depend*:N*o.meta:O
_makesyspath:= ${_PARSEDIR}
${_DEPENDFILE}: ${_depend} ${.PARSEDIR}/gendirdeps.mk ${META2DEPS} $${.MAKE.META.CREATED}
@echo Checking $@: ${.OODATE:T:[1..8]}
- @(cd . && \
+ @(cd . && ${GENDIRDEPS_ENV} \
SKIP_GENDIRDEPS='${SKIP_GENDIRDEPS:O:u}' \
DPADD='${FORCE_DPADD:O:u}' ${_gendirdeps_mutex} \
MAKESYSPATH=${_makesyspath} \
Modified: head/contrib/bmake/mk/meta.stage.mk
==============================================================================
--- head/contrib/bmake/mk/meta.stage.mk Thu Nov 2 19:53:51 2017 (r325339)
+++ head/contrib/bmake/mk/meta.stage.mk Thu Nov 2 20:08:00 2017 (r325340)
@@ -1,4 +1,4 @@
-# $Id: meta.stage.mk,v 1.54 2017/07/06 23:20:33 sjg Exp $
+# $Id: meta.stage.mk,v 1.55 2017/10/27 01:17:09 sjg Exp $
#
# @(#) Copyright (c) 2011-2017, Simon J. Gerraty
#
@@ -20,9 +20,9 @@
.if ${.MAKE.DEPENDFILE_PREFERENCE:U${.MAKE.DEPENDFILE}:M*.${MACHINE}} != ""
# this is generally safer anyway
-_dirdep = ${RELDIR}.${MACHINE}
+_dirdep ?= ${RELDIR}.${MACHINE}
.else
-_dirdep = ${RELDIR}
+_dirdep ?= ${RELDIR}
.endif
CLEANFILES+= .dirdep
Modified: head/contrib/bmake/mk/sys.clean-env.mk
==============================================================================
--- head/contrib/bmake/mk/sys.clean-env.mk Thu Nov 2 19:53:51 2017 (r325339)
+++ head/contrib/bmake/mk/sys.clean-env.mk Thu Nov 2 20:08:00 2017 (r325340)
@@ -1,4 +1,4 @@
-# $Id: sys.clean-env.mk,v 1.21 2016/02/18 21:16:40 sjg Exp $
+# $Id: sys.clean-env.mk,v 1.22 2017/10/25 23:44:20 sjg Exp $
#
# @(#) Copyright (c) 2009, Simon J. Gerraty
#
@@ -97,7 +97,7 @@ _objroot := ${OBJROOT:U${SB_OBJROOT:U${SB}/${SB_OBJPRE
.if ${MAKE_VERSION} < 20160218
_objtop := ${OBJTOP:U${_objroot}${MACHINE}}
# Take care of ${MACHINE}
-.if ${MACHINE} == "host" || ${OBJTOP} == ${HOST_OBJTOP:Uno}
+.if ${MACHINE:Nhost*} == "" || ${OBJTOP} == ${HOST_OBJTOP:Uno}
OBJTOP = ${_objtop:S,${HOST_TARGET}$,\${MACHINE},}
.else
OBJTOP = ${_objtop:S,${MACHINE}$,\${MACHINE},}
Modified: head/contrib/bmake/mk/whats.mk
==============================================================================
--- head/contrib/bmake/mk/whats.mk Thu Nov 2 19:53:51 2017 (r325339)
+++ head/contrib/bmake/mk/whats.mk Thu Nov 2 20:08:00 2017 (r325340)
@@ -1,4 +1,4 @@
-# $Id: whats.mk,v 1.1 2014/08/30 22:40:47 sjg Exp $
+# $Id: whats.mk,v 1.3 2017/10/19 06:09:14 sjg Exp $
#
# @(#) Copyright (c) 2014, Simon J. Gerraty
#
@@ -36,7 +36,8 @@ what_build_thing?= ${KMOD}.ko
.if !empty(what_thing)
# a unique name that won't conflict with anything
-what_uuid = what_${.CURDIR:T:hash}
+what_uuid = what_${what_thing}_${.CURDIR:T:hash}
+what_var = what_${.CURDIR:T:hash}
.if !empty(what_build_thing)
${what_build_thing}: ${what_build_exts:@e@${what_uuid}.$e@}
@@ -57,7 +58,7 @@ _what1:= @(\#)${what_thing:tu} built ${%Y%m%d:L:localt
_what2:= @(\#)${what_location}
${what_uuid}.c:
- echo '${_what_t} ${what_uuid}1[] = "${_what1}";' > $@ ${.OODATE:MNO_META_CMP}
- echo '${_what_t} ${what_uuid}2[] = "${_what2}";' >> $@
+ echo '${_what_t} ${what_var}1[] = "${_what1}";' > $@ ${.OODATE:MNO_META_CMP}
+ echo '${_what_t} ${what_var}2[] = "${_what2}";' >> $@
.endif
.endif
Modified: head/contrib/bmake/os.sh
==============================================================================
--- head/contrib/bmake/os.sh Thu Nov 2 19:53:51 2017 (r325339)
+++ head/contrib/bmake/os.sh Thu Nov 2 20:08:00 2017 (r325340)
@@ -17,7 +17,7 @@
# Simon J. Gerraty <sjg at crufty.net>
# RCSid:
-# $Id: os.sh,v 1.53 2017/01/11 20:01:09 sjg Exp $
+# $Id: os.sh,v 1.54 2017/09/08 06:17:22 sjg Exp $
#
# @(#) Copyright (c) 1994 Simon J. Gerraty
#
@@ -246,5 +246,7 @@ case /$0 in
echo "$v='$vv'"
done
;;
+*/host_target32) echo $HOST_TARGET32;;
+*/host_target) echo $HOST_TARGET;;
esac
Modified: head/contrib/bmake/unit-tests/dotwait.exp
==============================================================================
--- head/contrib/bmake/unit-tests/dotwait.exp Thu Nov 2 19:53:51 2017 (r325339)
+++ head/contrib/bmake/unit-tests/dotwait.exp Thu Nov 2 20:08:00 2017 (r325340)
@@ -22,9 +22,9 @@ shared.2.1
shared.2.1
shared.2.99
shared.2.99
+cycle.1.99
+cycle.1.99
make: Graph cycles through `cycle.2.99'
make: Graph cycles through `cycle.2.98'
make: Graph cycles through `cycle.2.97'
-cycle.1.99
-cycle.1.99
exit status 0
Modified: head/contrib/bmake/unit-tests/dotwait.mk
==============================================================================
--- head/contrib/bmake/unit-tests/dotwait.mk Thu Nov 2 19:53:51 2017 (r325339)
+++ head/contrib/bmake/unit-tests/dotwait.mk Thu Nov 2 20:08:00 2017 (r325340)
@@ -1,4 +1,4 @@
-# $NetBSD: dotwait.mk,v 1.1 2014/08/21 13:44:51 apb Exp $
+# $NetBSD: dotwait.mk,v 1.2 2017/10/08 20:44:19 sjg Exp $
THISMAKEFILE:= ${.PARSEDIR}/${.PARSEFILE}
@@ -11,7 +11,7 @@ PAUSE= sleep 1
# Ignore "--- target ---" lines printed by parallel make.
all:
.for t in ${TESTS}
- @${.MAKE} -f ${THISMAKEFILE} -j4 $t | grep -v "^--- "
+ @${.MAKE} -f ${THISMAKEFILE} -j4 $t 2>&1 | grep -v "^--- "
.endfor
#
Modified: head/usr.bin/bmake/Makefile
==============================================================================
--- head/usr.bin/bmake/Makefile Thu Nov 2 19:53:51 2017 (r325339)
+++ head/usr.bin/bmake/Makefile Thu Nov 2 20:08:00 2017 (r325340)
@@ -14,11 +14,8 @@ CFLAGS+= -I${.CURDIR}
CLEANDIRS+= FreeBSD
CLEANFILES+= bootstrap
-# $Id: Makefile,v 1.95 2017/07/20 19:36:13 sjg Exp $
+# $Id: Makefile,v 1.99 2017/08/13 20:12:53 sjg Exp $
-# Base version on src date
-_MAKE_VERSION= 20170720
-
PROG?= ${.CURDIR:T}
SRCS= \
@@ -74,6 +71,7 @@ SRCS+= \
lstReplace.c \
lstSucc.c
+
# this file gets generated by configure
.sinclude "Makefile.config"
@@ -159,9 +157,6 @@ MANDIR= ${MANDIR.bmake:U${SHAREDIR}/man}
.if !exists(.depend)
${OBJS}: config.h
.endif
-
-# make sure that MAKE_VERSION gets updated.
-main.o: ${SRCS} ${MAKEFILE}
# A simple unit-test driver to help catch regressions
Modified: head/usr.bin/bmake/Makefile.config
==============================================================================
--- head/usr.bin/bmake/Makefile.config Thu Nov 2 19:53:51 2017 (r325339)
+++ head/usr.bin/bmake/Makefile.config Thu Nov 2 20:08:00 2017 (r325340)
@@ -7,10 +7,12 @@ SRCTOP?= ${.CURDIR:H:H}
# things set by configure
-prefix= /usr
+_MAKE_VERSION=20171028
+
+prefix?= /usr
srcdir= ${SRCTOP}/contrib/bmake
CC?= gcc
-DEFAULT_SYS_PATH= .../share/mk:/usr/share/mk
+DEFAULT_SYS_PATH?= .../share/mk:/usr/share/mk
CPPFLAGS+=
CFLAGS+= ${CPPFLAGS} -DHAVE_CONFIG_H
@@ -22,4 +24,3 @@ FILEMON_H= /usr/include/dev/filemon/filemon.h
BMAKE_PATH_MAX?= 1024
# used if MAXPATHLEN not defined
CPPFLAGS+= -DBMAKE_PATH_MAX=${BMAKE_PATH_MAX}
-
Modified: head/usr.bin/bmake/config.h
==============================================================================
--- head/usr.bin/bmake/config.h Thu Nov 2 19:53:51 2017 (r325339)
+++ head/usr.bin/bmake/config.h Thu Nov 2 20:08:00 2017 (r325340)
@@ -245,7 +245,7 @@
#define PACKAGE_NAME "bmake"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "bmake 20160606"
+#define PACKAGE_STRING "bmake 20170812"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "bmake"
@@ -254,7 +254,7 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "20160606"
+#define PACKAGE_VERSION "20170812"
/* Define as the return type of signal handlers (`int' or `void'). */
#define RETSIGTYPE void
More information about the svn-src-all
mailing list